From 93cc9f435b37c0b29478660f7b4375ec1a6707b4 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sat, 5 Oct 2019 22:42:29 +0200 Subject: [PATCH] String formatting simplification --- apk/vmmgr | 2 +- build/usr/lib/python3.6/lxcbuild/apppacker.py | 2 +- build/usr/lib/python3.6/lxcbuild/imagepacker.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apk/vmmgr b/apk/vmmgr index b02fc3f..ecfa225 160000 --- a/apk/vmmgr +++ b/apk/vmmgr @@ -1 +1 @@ -Subproject commit b02fc3f42c65d8833451e41b550f7588c9de2cc2 +Subproject commit ecfa2251877abd38e681b0faa35fc4c246723e11 diff --git a/build/usr/lib/python3.6/lxcbuild/apppacker.py b/build/usr/lib/python3.6/lxcbuild/apppacker.py index dac61cd..29412de 100644 --- a/build/usr/lib/python3.6/lxcbuild/apppacker.py +++ b/build/usr/lib/python3.6/lxcbuild/apppacker.py @@ -47,7 +47,7 @@ class AppPacker(Packer): def register(self): # Register package in global repository metadata file - print('Registering package {}'.format(self.app.name)) + print('Registering package', self.app.name) self.packages['apps'][self.app.name] = self.app.conf.copy() self.packages['apps'][self.app.name]['size'] = self.tar_size self.packages['apps'][self.app.name]['pkgsize'] = self.xz_size diff --git a/build/usr/lib/python3.6/lxcbuild/imagepacker.py b/build/usr/lib/python3.6/lxcbuild/imagepacker.py index 9c3b869..aad02d0 100644 --- a/build/usr/lib/python3.6/lxcbuild/imagepacker.py +++ b/build/usr/lib/python3.6/lxcbuild/imagepacker.py @@ -40,13 +40,13 @@ class ImagePacker(Packer): def create_archive(self): # Create archive - print('Archiving', self.image.path) + print('Archiving', self.image.name) subprocess.run(['tar', '--xattrs', '-cpf', self.tar_path, self.image.name], cwd=LXC_STORAGE_DIR) self.compress_archive() def register(self): # Register image in global repository metadata file - print('Registering package {}'.format(self.image.name)) + print('Registering package', self.image.name) self.packages['images'][self.image.name] = self.image.conf.copy() self.packages['images'][self.image.name]['size'] = self.tar_size self.packages['images'][self.image.name]['pkgsize'] = self.xz_size