Kiril Nesenko has uploaded a new change for review. Change subject: Fix --version option ......................................................................
Fix --version option Change-Id: If817260837cadf6a64cf9a4d6a21af6776c48a6c Signed-off-by: Kiril Nesenko <[email protected]> --- M src/__main__.py M src/config.py.in.in 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector refs/changes/18/14118/1 diff --git a/src/__main__.py b/src/__main__.py index 74e9126..23c8790 100755 --- a/src/__main__.py +++ b/src/__main__.py @@ -1146,9 +1146,10 @@ OptionParser.format_epilog = lambda self, formatter: self.epilog parser = OptionParser( usage_string, - version="{pkg_name}-{pkg_version}".format( + version="{pkg_name}-{pkg_rpm_version}-{pkg_rpm_release}".format( pkg_name=config.PACKAGE_NAME, - pkg_version=config.PACKAGE_VERSION + pkg_rpm_version=config.PACKAGE_RPM_VERSION, + pkg_rpm_release=config.PACKAGE_RPM_RELEASE ), epilog=epilog_string ) diff --git a/src/config.py.in.in b/src/config.py.in.in index 39a1704..3729086 100644 --- a/src/config.py.in.in +++ b/src/config.py.in.in @@ -3,7 +3,8 @@ """ PACKAGE_NAME = "@PACKAGE_NAME@" -PACKAGE_VERSION = "@PACKAGE_VERSION@" +PACKAGE_RPM_VERSION = "@PACKAGE_RPM_VERSION@" +PACKAGE_RPM_RELEASE = "@PACKAGE_RPM_RELEASE@" FILE_PG_PASS = "@engineconfigdir_POST@/.pgpass" -- To view, visit http://gerrit.ovirt.org/14118 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If817260837cadf6a64cf9a4d6a21af6776c48a6c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-log-collector Gerrit-Branch: master Gerrit-Owner: Kiril Nesenko <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
