better lxc-pack unlinking

This commit is contained in:
Disassembler 2018-10-02 17:38:58 +02:00
parent dbce751225
commit 30254eb527
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499

View File

@ -31,11 +31,10 @@ def pack(pkg_file):
xz_path = '{}.xz'.format(tar_path) xz_path = '{}.xz'.format(tar_path)
# Remove old package # Remove old package
try: if os.path.exists(tar_path):
os.unlink(tar_path) os.unlink(tar_path)
if os.path.exists(xz_path):
os.unlink(xz_path) os.unlink(xz_path)
except:
pass
# Create archive # Create archive
print('Archiving', meta['lxcpath']) print('Archiving', meta['lxcpath'])
@ -51,11 +50,9 @@ def pack(pkg_file):
print('Registering package') print('Registering package')
packages = {} packages = {}
packages_file = os.path.join(BUILD_ROOT, 'packages') packages_file = os.path.join(BUILD_ROOT, 'packages')
try: if os.path.exists(packages_file):
with open(packages_file, 'r') as fd: with open(packages_file, 'r') as fd:
packages = json.load(fd) packages = json.load(fd)
except:
pass
packages[pkg_name] = meta packages[pkg_name] = meta
with open(packages_file, 'w') as fd: with open(packages_file, 'w') as fd:
json.dump(packages, fd, sort_keys=True, indent=4) json.dump(packages, fd, sort_keys=True, indent=4)