Spotter-Cluster/Spotter-VM
2
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix packaging

Browse Source
This commit is contained in:
Disassembler 2019-09-23 15:34:37 +02:00
parent bbfe11f557
commit b1d705487a
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apk/vmmgr

@ -1 +1 @@
Subproject commit 4c2616887f52b1265aa5943d1b6bd0f7d5e9f008 Subproject commit 7b045cf9c3e7f0de494a75e99a9f2a9d34d4772d

2
build/usr/bin/lxcbuild Normal file → Executable file
View File

@ -24,7 +24,7 @@ if os.path.isfile(buildpath):
image.build_and_pack(args.force) image.build_and_pack(args.force)
elif basename == 'meta' or basename.endswith('.meta'): elif basename == 'meta' or basename.endswith('.meta'):
app = App(buildpath) app = App(buildpath)
app.build_and_pack() app.pack()
else: else:
print('Unknown file {} given, expected "lxcfile" or "meta"'.format(buildpath)) print('Unknown file {} given, expected "lxcfile" or "meta"'.format(buildpath))
sys.exit(1) sys.exit(1)

6
build/usr/lib/python3.6/lxcbuild/image.py
View File

@ -14,12 +14,12 @@ class Image:
self.lxcfile = lxcfile self.lxcfile = lxcfile
self.build_dir = os.path.dirname(lxcfile) self.build_dir = os.path.dirname(lxcfile)
def build_and_pack(self, force=False): def build_and_pack(self, force):
self.conf['build'] = True self.conf['build'] = True
try: try:
builder = Builder() builder = Builder()
builder.build(self, force) builder.build(self, force)
# In case of successful build, packaging needs to be forced to prevent outdated packages # In case of successful build, packaging needs to happen in all cases to prevent outdated packages
force = True force = True
except ImageExistsError as e: except ImageExistsError as e:
print('Image {} already exists, skipping build tasks'.format(e)) print('Image {} already exists, skipping build tasks'.format(e))
@ -30,9 +30,9 @@ class Image:
except: except:
builder.clean() builder.clean()
raise raise
del self.conf['build']
try: try:
packer = Packer() packer = Packer()
packer.pack_image(self, force) packer.pack_image(self, force)
except PackageExistsError as e: except PackageExistsError as e:
print('Package {} already exists, skipping packaging tasks'.format(e)) print('Package {} already exists, skipping packaging tasks'.format(e))
del self.conf['build']

16
build/usr/lib/python3.6/lxcbuild/packer.py
View File

@ -36,12 +36,14 @@ class Packer:
# Prepare package file names # Prepare package file names
self.tar_path = os.path.join(REPO_IMAGES_DIR, '{}.tar'.format(self.image.name)) self.tar_path = os.path.join(REPO_IMAGES_DIR, '{}.tar'.format(self.image.name))
self.xz_path = '{}.xz'.format(self.tar_path) self.xz_path = '{}.xz'.format(self.tar_path)
if os.path.exists(self.xz_path): if force:
if force: self.unregister_image()
self.unregister_image() try:
os.unlink(self.xz_path) os.unlink(self.xz_path)
else: except FileNotFoundError:
raise PackageExistsError(self.xz_path) pass
elif os.path.exists(self.xz_path):
raise PackageExistsError(self.xz_path)
self.create_image_archive() self.create_image_archive()
self.register_image() self.register_image()
self.sign_packages() self.sign_packages()
@ -90,8 +92,10 @@ class Packer:
# Prepare package file names # Prepare package file names
self.tar_path = os.path.join(REPO_APPS_DIR, '{}.tar'.format(self.app.name)) self.tar_path = os.path.join(REPO_APPS_DIR, '{}.tar'.format(self.app.name))
self.xz_path = '{}.xz'.format(self.tar_path) self.xz_path = '{}.xz'.format(self.tar_path)
if os.path.exists(self.xz_path): try:
os.unlink(self.xz_path) os.unlink(self.xz_path)
except FileNotFoundError:
pass
self.create_app_archive() self.create_app_archive()
self.register_app() self.register_app()
self.sign_packages() self.sign_packages()