Skip to content

ignore epoch for RPM packages #402

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ignore epoch for RPM packages #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion client/patchman-client
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ get_installed_rpm_packages() {
echo 'Finding installed rpms...'
fi

rpm -qa --queryformat "'%{NAME}' '%{EPOCH}' '%{version}' '%{RELEASE}' '%{ARCH}' 'rpm'\n" 2>/dev/null \
rpm -qa --queryformat "'%{NAME}' '%{version}' '%{RELEASE}' '%{ARCH}' 'rpm'\n" 2>/dev/null \
| sed -e 's/(none)//g' \
| sed -e 's/\+/%2b/g' >> "${tmpfile_pkg}"

Expand Down
5 changes: 1 addition & 4 deletions repos/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,18 +293,15 @@ def extract_yum_packages(data, url):
namespaces={'ns': ns})[0].text
fullversion = elem.xpath('//ns:version',
namespaces={'ns': ns})[0]
epoch = fullversion.get('epoch')
version = fullversion.get('ver')
release = fullversion.get('rel')
elem.clear()
while elem.getprevious() is not None:
del elem.getparent()[0]

if name != '' and version != '' and arch != '':
if epoch == '0':
epoch = ''
package = PackageString(name=name,
epoch=epoch,
epoch='',
version=version,
release=release,
arch=arch,
Expand Down