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.

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

Fixes #12798: zypper module arch and version specification for zypper commands is not correct #777

Conversation

amousset
Copy link
Member

@amousset
Copy link
Member Author

Do not merge for now.

@@ -33,7 +33,7 @@ import re

rpm_cmd = os.environ.get('CFENGINE_TEST_RPM_CMD', "/bin/rpm")
rpm_quiet_option = ["--quiet"]
rpm_output_format = "Name=%{name}\nVersion=%{version}-%{release}\nArchitecture=%{arch}\n"
rpm_output_format = "Name=%{name}\nVersion=%|EPOCH?{%{epoch}:}:{}|%{version}-%{release}\nArchitecture=%{arch}\n"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This syntax works in RHEL3 ans SLES11, it should be safe to use everywhere

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works on SLES11, I still need to test on SLES10 and SLES12.

@amousset amousset changed the title Fixes #12798: Epoch in software versions is not stored by zypper (and yum?) module, which breaks version detection Fixes #12798: Epoch in software versions is not stored by zypper module, which breaks version detection Jun 19, 2018
@amousset
Copy link
Member Author

Commit modified

@amousset amousset force-pushed the bug_12798/epoch_in_software_versions_is_not_stored_by_zypper_and_yum_module_which_breaks_version_detection branch from 219d654 to c111b32 Compare June 20, 2018 09:34
@amousset
Copy link
Member Author

Commit modified

@amousset amousset force-pushed the bug_12798/epoch_in_software_versions_is_not_stored_by_zypper_and_yum_module_which_breaks_version_detection branch from c111b32 to 2077333 Compare June 20, 2018 09:40
@amousset amousset changed the title Fixes #12798: Epoch in software versions is not stored by zypper module, which breaks version detection Fixes #12798: zypper module arch and version specification for zypper commands is not correct Jun 20, 2018
@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/ncf/pull/777
-- Your faithful QA

@amousset
Copy link
Member Author

OK, merging this PR

@amousset amousset merged commit 2077333 into Normation:branches/rudder/4.1 Jun 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants