Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add suffix for unverified RPMs.

Browse Source
This commit is contained in:
WillyPillow 2020-07-11 22:31:38 +08:00
parent addb677506
commit 8a4b5e683a
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qubesadmin/tools/qvm_template.py
View File

@ -22,6 +22,7 @@ PATH_PREFIX = '/var/lib/qubes/vm-templates'
TEMP_DIR = '/var/tmp' TEMP_DIR = '/var/tmp'
PACKAGE_NAME_PREFIX = 'qubes-template-' PACKAGE_NAME_PREFIX = 'qubes-template-'
CACHE_DIR = os.path.join(xdg.BaseDirectory.xdg_cache_home, 'qvm-template') CACHE_DIR = os.path.join(xdg.BaseDirectory.xdg_cache_home, 'qvm-template')
UNVERIFIED_SUFFIX = '.unverified'
def qubes_release(): def qubes_release():
if os.path.exists('/usr/share/qubes/marker-vm'): if os.path.exists('/usr/share/qubes/marker-vm'):
@ -147,11 +148,14 @@ def install(args, app):
rpm_list.append(os.path.join(args.cachedir, target_file)) rpm_list.append(os.path.join(args.cachedir, target_file))
dl_list = dl_list_copy dl_list = dl_list_copy
download(args, app, path_override=args.cachedir, dl_list=dl_list) download(args, app, path_override=args.cachedir,
dl_list=dl_list, suffix=UNVERIFIED_SUFFIX)
for rpmfile in rpm_list: for idx, rpmfile in enumerate(rpm_list):
if not verify_rpm(rpmfile, args.nogpgcheck, transaction_set): path = rpmfile + UNVERIFIED_SUFFIX
if not verify_rpm(path, args.nogpgcheck, transaction_set):
parser.error('Package \'%s\' verification failed.' % template) parser.error('Package \'%s\' verification failed.' % template)
os.rename(path, rpmfile)
for rpmfile in rpm_list: for rpmfile in rpm_list:
with tempfile.TemporaryDirectory(dir=TEMP_DIR) as target: with tempfile.TemporaryDirectory(dir=TEMP_DIR) as target:
@ -356,7 +360,7 @@ def get_dl_list(args, app):
candid[name] = (ver, int(dlsize)) candid[name] = (ver, int(dlsize))
return candid return candid
def download(args, app, path_override=None, dl_list=None): def download(args, app, path_override=None, dl_list=None, suffix=''):
if dl_list is None: if dl_list is None:
dl_list = get_dl_list(args, app) dl_list = get_dl_list(args, app)
@ -365,15 +369,21 @@ def download(args, app, path_override=None, dl_list=None):
version_str = build_version_str(ver) version_str = build_version_str(ver)
spec = PACKAGE_NAME_PREFIX + name + '-' + version_str spec = PACKAGE_NAME_PREFIX + name + '-' + version_str
target = os.path.join(path, '%s.rpm' % spec) target = os.path.join(path, '%s.rpm' % spec)
target_suffix = target + suffix
if suffix != '' and os.path.exists(target_suffix):
print('\'%s\' already exists, skipping...' % target,
file=sys.stderr)
if os.path.exists(target): if os.path.exists(target):
print('\'%s\' already exists, skipping...' % target, print('\'%s\' already exists, skipping...' % target,
file=sys.stderr) file=sys.stderr)
if suffix != '':
os.rename(target, target_suffix)
else: else:
print('Downloading \'%s\'...' % spec, file=sys.stderr) print('Downloading \'%s\'...' % spec, file=sys.stderr)
ok = False ok = False
for attempt in range(args.retries): for attempt in range(args.retries):
try: try:
qrexec_download(args, app, spec, target, dlsize) qrexec_download(args, app, spec, target_suffix, dlsize)
ok = True ok = True
break break
except ConnectionError: except ConnectionError:
@ -382,7 +392,7 @@ def download(args, app, path_override=None, dl_list=None):
file=sys.stderr) file=sys.stderr)
if not ok: if not ok:
print('\'%s\' download failed.' % spec, file=sys.stderr) print('\'%s\' download failed.' % spec, file=sys.stderr)
os.remove(target) os.remove(target_suffix)
sys.exit(1) sys.exit(1)
def remove(args, app): def remove(args, app):