Alon Bar-Lev has posted comments on this change. Change subject: tools: fixed --version output ......................................................................
Patch Set 1: (3 inline comments) .................................................... File src/config.py.in Line 4: Line 5: PACKAGE_NAME = "@PACKAGE_NAME@" Line 6: PACKAGE_VERSION = "@PACKAGE_VERSION@" Line 7: Line 8: FILE_PG_PASS = "/etc/ovirt-engine/.pgpass" If we go by config.py.in I suggest to replace the /etc with @sysconfdir@ or @engineconfigdir@ same for the pki dir. This can be done by using config.in.in see[1][2][3]. At [2] notice the include of [3], the SUFFIXES = .in and references to config.py. [1] http://gerrit.ovirt.org/gitweb?p=otopi.git;a=blob;f=src/otopi/config.py.in.in;hb=HEAD [2] http://gerrit.ovirt.org/gitweb?p=otopi.git;a=blob;f=src/otopi/Makefile.am;hb=HEAD [3] http://gerrit.ovirt.org/gitweb?p=otopi.git;a=blob;f=build/subst.inc;hb=HEAD Line 9: Line 10: DEFAULT_CA_PEM = "/etc/pki/ovirt-engine/ca.pem" Line 11: DEFAULT_SSH_KEY = "/etc/pki/ovirt-engine/keys/engine_id_rsa" Line 12: DEFAULT_CONFIGURATION_FILE = "/etc/logcollector.conf" .................................................... File src/__main__.py Line 32: import dateutil.parser Line 33: import dateutil.tz as tz Line 34: from helper import hypervisors Line 35: Line 36: from ovirt_log_collector.config import * from ovirt_log_collector import config ? Line 37: Line 38: STREAM_LOG_FORMAT = '%(levelname)s: %(message)s' Line 39: FILE_LOG_FORMAT = '%(asctime)s::%(levelname)s::%(module)s::%(lineno)d::%(name)s:: %(message)s' Line 40: FILE_LOG_DSTMP = '%Y-%m-%d %H:%M:%S' Line 901: OptionParser.format_epilog = lambda self, formatter: self.epilog Line 902: parser = OptionParser( Line 903: usage_string, Line 904: version="{pkg_name}-{pkg_version}".format( Line 905: pkg_name=PACKAGE_NAME, config.PACKAGE_NAME etc.. Line 906: pkg_version=PACKAGE_VERSION Line 907: ), Line 908: epilog=epilog_string Line 909: ) -- To view, visit http://gerrit.ovirt.org/12735 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I88f53765028284221a0506efbc595b146a2bca8a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-log-collector Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> Gerrit-Reviewer: Alex Lourie <alou...@redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alo...@redhat.com> Gerrit-Reviewer: Keith Robertson <krobe...@redhat.com> Gerrit-Reviewer: Kiril Nesenko <knese...@redhat.com> Gerrit-Reviewer: Moran Goldboim <mgold...@redhat.com> Gerrit-Reviewer: Ofer Schreiber <oschr...@redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
