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

qvm-template: Make pylint happy.

Browse Source
This commit is contained in:
WillyPillow 2020-08-01 02:56:59 +08:00
parent 3d0a39523b
commit 40e7304f17
No known key found for this signature in database
GPG Key ID: 3839E194B1415A9C
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qubesadmin/tools/qvm_template.py
View File

@ -463,13 +463,12 @@ def install(args, app, version_selector=VersionSelector.LATEST,
try: try:
transaction_set = rpm.TransactionSet() transaction_set = rpm.TransactionSet()
rpm_list = [] # rpmfile, dlsize, reponame rpm_list = [] # rpmfile, reponame
for template in args.templates: for template in args.templates:
if template.endswith('.rpm'): if template.endswith('.rpm'):
if not os.path.exists(template): if not os.path.exists(template):
parser.error('RPM file \'%s\' not found.' % template) parser.error('RPM file \'%s\' not found.' % template)
size = os.path.getsize(template) rpm_list.append((template, '@commandline'))
rpm_list.append((template, size, '@commandline'))
os.makedirs(args.cachedir, exist_ok=True) os.makedirs(args.cachedir, exist_ok=True)
@ -488,8 +487,8 @@ def install(args, app, version_selector=VersionSelector.LATEST,
version_str = build_version_str(entry.evr) version_str = build_version_str(entry.evr)
target_file = \ target_file = \
'%s%s-%s.rpm' % (PACKAGE_NAME_PREFIX, name, version_str) '%s%s-%s.rpm' % (PACKAGE_NAME_PREFIX, name, version_str)
rpm_list.append((os.path.join(args.cachedir, target_file), rpm_list.append(
entry.dlsize, entry.reponame)) (os.path.join(args.cachedir, target_file), entry.reponame))
dl_list = dl_list_copy dl_list = dl_list_copy
download(args, app, path_override=args.cachedir, download(args, app, path_override=args.cachedir,
@ -497,7 +496,7 @@ def install(args, app, version_selector=VersionSelector.LATEST,
version_selector=version_selector) version_selector=version_selector)
# Verify package and remove unverified suffix # Verify package and remove unverified suffix
for rpmfile, dlsize, reponame in rpm_list: for rpmfile, reponame in rpm_list:
if reponame != '@commandline': if reponame != '@commandline':
path = rpmfile + UNVERIFIED_SUFFIX path = rpmfile + UNVERIFIED_SUFFIX
else: else:
@ -508,7 +507,7 @@ def install(args, app, version_selector=VersionSelector.LATEST,
os.rename(path, rpmfile) os.rename(path, rpmfile)
# Unpack and install # Unpack and install
for rpmfile, dlsize, reponame in rpm_list: for rpmfile, reponame in rpm_list:
with tempfile.TemporaryDirectory(dir=TEMP_DIR) as target: with tempfile.TemporaryDirectory(dir=TEMP_DIR) as target:
package_hdr = get_package_hdr(rpmfile) package_hdr = get_package_hdr(rpmfile)
package_name = package_hdr[rpm.RPMTAG_NAME] package_name = package_hdr[rpm.RPMTAG_NAME]
@ -525,9 +524,10 @@ def install(args, app, version_selector=VersionSelector.LATEST,
' {reinstall,upgrade,downgrade}' ' {reinstall,upgrade,downgrade}'
' operations.)') % name, file=sys.stderr) ' operations.)') % name, file=sys.stderr)
continue continue
# Check if local versus candidate version is in line with the # Check if local versus candidate version is in line with the
# operation # operation
elif override_existing: if override_existing:
if name not in app.domains: if name not in app.domains:
parser.error( parser.error(
"Template '%s' not already installed." % name) "Template '%s' not already installed." % name)
@ -702,7 +702,7 @@ def search(args, app):
# Get latest version for each template # Get latest version for each template
query_res_tmp = [] query_res_tmp = []
for name, grp in itertools.groupby(sorted(query_res), lambda x: x[0]): for _, grp in itertools.groupby(sorted(query_res), lambda x: x[0]):
def compare(lhs, rhs): def compare(lhs, rhs):
return lhs if rpm.labelCompare(lhs[1:4], rhs[1:4]) < 0 else rhs return lhs if rpm.labelCompare(lhs[1:4], rhs[1:4]) < 0 else rhs
query_res_tmp.append(functools.reduce(compare, grp)) query_res_tmp.append(functools.reduce(compare, grp))
@ -753,7 +753,7 @@ def search(args, app):
search_res = sorted(search_res.items(), key=key_func) search_res = sorted(search_res.items(), key=key_func)
def gen_header(idx, needles): def gen_header(needles):
fields = [] fields = []
weight_types = set(x[0] for x in needles) weight_types = set(x[0] for x in needles)
for weight, field in WEIGHT_TO_FIELD: for weight, field in WEIGHT_TO_FIELD:
@ -767,7 +767,7 @@ def search(args, app):
last_header = '' last_header = ''
for idx, needles in search_res: for idx, needles in search_res:
# Print headers # Print headers
cur_header = gen_header(idx, needles) cur_header = gen_header(needles)
if last_header != cur_header: if last_header != cur_header:
last_header = cur_header last_header = cur_header
# XXX: The style is different from that of DNF # XXX: The style is different from that of DNF