Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use pkg_infos() to speed up rpm_build_info() #2287

Closed
wants to merge 2 commits into from
Closed

Use pkg_infos() to speed up rpm_build_info() #2287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a55cf79
Pass string with pkg to logger.info()
chrstphrchvz Mar 11, 2021
198f733
Use pkg_infos() to speed up rpm_build_info()
chrstphrchvz Mar 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 20 additions & 33 deletions src/rockstor/system/pkg_mgmt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,40 +105,27 @@ def current_version():
def rpm_build_info(pkg):
version = "Unknown Version"
date = None
distro_id = distro.id()

if pkg_infos(pkg, tag='NAME') != pkg:
logger.info('No "{}" package found: source install?'.format(pkg))
return version, date

buildtime_str = pkg_infos(pkg, tag='BUILDTIME')
version_str = pkg_infos(pkg, tag='VERSION')
release_str = pkg_infos(pkg, tag='RELEASE')

try:
o, e, rc = run_command([YUM, "info", "installed", "-v", pkg])
except CommandException as e:
# Catch "No matching Packages to list" so we can return:
# "Unknown Version", None
emsg = "Error: No matching Packages to list"
# By checking both the first error element and the second to last we
# catch one yum waiting for another to release yum lock.
if e.err[0] == emsg or e.err[-2] == emsg:
logger.info('No "rockstor" package found: source install?')
return version, date
# otherwise we raise an exception as normal.
raise e
for l in o:
if re.match("Buildtime", l) is not None:
# Legacy Rockstor (using original yum):
# "Buildtime : Tue Dec 5 13:34:06 2017"
# openSUSE Rocsktor (using dnf-yum):
# "Buildtime : Fri 29 Nov 2019 18:34:43 GMT"
# we return 2017-Dec-06 or 2019-Nov-29
# Note the one day on from retrieved Buildtime with zero padding.
dfields = l.strip().split()
if distro_id == "rockstor": # CentOS based Rockstor conditional
dstr = dfields[6] + " " + dfields[3] + " " + dfields[4]
else: # Assuming we are openSUSE variant and so using dnf-yum
dstr = dfields[5] + " " + dfields[4] + " " + dfields[3]
bdate = datetime.strptime(dstr, "%Y %b %d")
bdate += timedelta(days=1)
date = bdate.strftime("%Y-%b-%d")
if re.match("Version ", l) is not None:
version = l.strip().split()[2]
if re.match("Release ", l) is not None:
version = "{}-{}".format(version, l.strip().split()[2])
bdate = datetime.fromtimestamp(int(buildtime_str))
except (ValueError, OverflowError):
pass
else:
bdate += timedelta(days=1)
date = bdate.strftime("%Y-%b-%d")

if version_str:
version = version_str
if release_str:
version = "{}-{}".format(version, release_str)
return version, date


Expand Down