live_images: replace hardcoded path substition with translate_path() call
Signed-off-by: Lubos Kocman <lkocman@redhat.com>
This commit is contained in:
		
							parent
							
								
									158d1834a6
								
							
						
					
					
						commit
						abb2ff1584
					
				| @ -21,7 +21,6 @@ import copy | |||||||
| import time | import time | ||||||
| import pipes | import pipes | ||||||
| import shutil | import shutil | ||||||
| import re |  | ||||||
| import tempfile | import tempfile | ||||||
| 
 | 
 | ||||||
| from kobo.threads import ThreadPool, WorkerThread | from kobo.threads import ThreadPool, WorkerThread | ||||||
| @ -32,6 +31,7 @@ from pungi.wrappers.iso import IsoWrapper | |||||||
| from pungi.wrappers.scm import get_file_from_scm | from pungi.wrappers.scm import get_file_from_scm | ||||||
| from pungi.phases.base import PhaseBase | from pungi.phases.base import PhaseBase | ||||||
| from pungi.util import get_arch_variant_data | from pungi.util import get_arch_variant_data | ||||||
|  | from pungi.paths import translate_path | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| # HACK: define cmp in python3 | # HACK: define cmp in python3 | ||||||
| @ -93,10 +93,7 @@ class LiveImagesPhase(PhaseBase): | |||||||
|                     "cmd": [], |                     "cmd": [], | ||||||
|                     "label": "",  # currently not used |                     "label": "",  # currently not used | ||||||
|                 } |                 } | ||||||
|                 repo = self.compose.paths.compose.repository(arch, variant) |                 cmd["repos"] = [translate_path(self.compose, self.compose.paths.compose.repository(arch, variant))] | ||||||
|                 # HACK: |  | ||||||
|                 repo = re.sub(r"^/mnt/koji/", "https://kojipkgs.fedoraproject.org/", repo) |  | ||||||
|                 cmd["repos"] = [repo] |  | ||||||
| 
 | 
 | ||||||
|                 # additional repos |                 # additional repos | ||||||
|                 data = get_arch_variant_data(self.compose.conf, "live_images", arch, variant) |                 data = get_arch_variant_data(self.compose.conf, "live_images", arch, variant) | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user