robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[image-build] Stop creating wrong arch dirs

Browse source 
There is no such arch as $arch or %(arch)s.

Pagure: #124
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-01-19 08:24:02 +01:00
parent 6e0f6ee73e
commit e016015cf3
3 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pungi/paths.py
View file

@ -515,7 +515,7 @@ class ComposePaths(object):
return os.path.join(path, filename)
def image_dir(self, variant, symlink_to=None, create_dir=True, relative=False):
def image_dir(self, variant, symlink_to=None, relative=False):
"""
The arch is listed as literal '%(arch)s'
Examples:
@ -523,21 +523,18 @@ class ComposePaths(object):
None
@param variant
@param symlink_to=None
@param create_dir=True
@param relative=False
"""
# skip optional and addons
if variant.type != "variant":
return None
path = os.path.join(self.topdir('%(arch)s', variant, create_dir=create_dir, relative=relative),
path = os.path.join(self.topdir('%(arch)s', variant, create_dir=False, relative=relative),
"images")
if symlink_to:
topdir = self.compose.topdir.rstrip("/") + "/"
relative_dir = path[len(topdir):]
target_dir = os.path.join(symlink_to, self.compose.compose_id, relative_dir)
if create_dir and not relative:
makedirs(target_dir)
try:
os.symlink(target_dir, path)
except OSError as ex:
@ -548,9 +545,6 @@ class ComposePaths(object):
raise RuntimeError(msg)
if os.path.abspath(os.readlink(path)) != target_dir:
raise RuntimeError(msg)
else:
if create_dir and not relative:
makedirs(path)
return path
def jigdo_dir(self, arch, variant, create_dir=True, relative=False):