particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drop dir_moves var

Browse source
This commit is contained in:
Mike McLean 2023-09-20 11:27:00 -04:00 • committed by Tomas Kopecek
parent a171b85bed
commit 9f8ed4e600
1 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
kojihub/kojihub.py
View file

@ -5835,24 +5835,21 @@ def _set_build_volume(binfo, volinfo, strict=True):
raise koji.GenericError("Unexpected cross-volume content: %s" % checkdir)
# First copy the build dir(s)
dir_moves = []
old_binfo = binfo.copy()
binfo['volume_id'] = volinfo['id']
binfo['volume_name'] = volinfo['name']
olddir = koji.pathinfo.build(old_binfo)
if os.path.exists(olddir):
newdir = koji.pathinfo.build(binfo)
dir_moves.append([olddir, newdir])
elif strict:
# Shouldn't ever happen
newdir = koji.pathinfo.build(binfo)
if not os.path.exists(olddir):
raise koji.GenericError(f"Build directory missing: {olddir}")
for olddir, newdir in dir_moves:
# Remove old symlink if copying to base volume
if volinfo['name'] == 'DEFAULT' or volinfo['name'] is None:
if os.path.islink(newdir):
os.unlink(newdir)
koji.ensuredir(os.path.dirname(newdir))
shutil.copytree(olddir, newdir, symlinks=True)
if not os.path.isdir(olddir):
raise koji.GenericError(f"Not a directory: {olddir}")
# Remove old symlink if copying to base volume
if volinfo['name'] == 'DEFAULT' or volinfo['name'] is None:
if os.path.islink(newdir):
os.unlink(newdir)
koji.ensuredir(os.path.dirname(newdir))
shutil.copytree(olddir, newdir, symlinks=True)
# Second, update the db
koji.plugin.run_callbacks('preBuildStateChange', attribute='volume_id',
@ -5864,8 +5861,7 @@ def _set_build_volume(binfo, volinfo, strict=True):
set_tag_update(tag['id'], 'VOLUME_CHANGE')
# Third, delete the old content
for olddir, newdir in dir_moves:
koji.util.rmtree(olddir)
koji.util.rmtree(olddir)
# Fourth, maintain a symlink if appropriate
if volinfo['name'] and volinfo['name'] != 'DEFAULT':