From 8d37572fa5be96fe9638f88bb5baa6b521739182 Mon Sep 17 00:00:00 2001 From: fuzzyray Date: Thu, 21 May 2009 01:57:59 +0000 Subject: [PATCH] Change /etc/gentoolkit-version to /usr/share/gentoolkit/VERSION svn path=/trunk/gentoolkit/; revision=651 --- ChangeLog | 4 ++++ bin/eclean | 2 +- bin/epkginfo | 2 +- bin/euse | 2 +- bin/glsa-check | 2 +- pym/gentoolkit/equery/__init__.py | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92f3f27..03e413f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-05-20: Paul Varner + * All: Convert from using /etc/gentoolkit-version to + /usr/share/gentoolkit/VERSION + 2009-05-20: Paul Varner * glsa-check: Add patches from Robert Buchholz to do the following: Handle unicode encoding better, python tweaks to speedup execution, diff --git a/bin/eclean b/bin/eclean index 5497cf3..9953fa7 100644 --- a/bin/eclean +++ b/bin/eclean @@ -9,7 +9,7 @@ from __future__ import with_statement # Meta: __author__ = "Thomas de Grenier de Latour (tgl)" __email__ = "degrenier@easyconnect.fr" -__version__ = open('/etc/gentoolkit-version').read().strip() +__version__ = open('/usr/share/gentoolkit/VERSION').read().strip() __productname__ = "eclean" __description__ = "A cleaning tool for Gentoo distfiles and binaries." diff --git a/bin/epkginfo b/bin/epkginfo index 313170a..b7d6f63 100755 --- a/bin/epkginfo +++ b/bin/epkginfo @@ -19,7 +19,7 @@ from xml.sax.handler import feature_namespaces import portage from portage.output import * -version = open('/etc/gentoolkit-version').read().strip() +version = open('/usr/share/gentoolkit/VERSION').read().strip() def getvar(pkg, var): file = open(pkg + ".ebuild") diff --git a/bin/euse b/bin/euse index df61e32..10f75b0 100755 --- a/bin/euse +++ b/bin/euse @@ -7,7 +7,7 @@ # Licensed under the GPL v2 PROGRAM_NAME=euse -PROGRAM_VERSION=$(cat /etc/gentoolkit-version) +PROGRAM_VERSION=$(cat /usr/share/gentoolkit/VERSION) MAKE_CONF_PATH=/etc/make.conf MAKE_GLOBALS_PATH=/etc/make.globals diff --git a/bin/glsa-check b/bin/glsa-check index 3c91d5e..c24ef23 100644 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -21,7 +21,7 @@ from getopt import getopt, GetoptError __program__ = "glsa-check" __author__ = "Marius Mauch " -__version__ = open("/etc/gentoolkit-version").read().strip() +__version__ = open("/usr/share/gentoolkit/VERSION").read().strip() optionmap = [ ["-l", "--list", "list all unapplied GLSA"], diff --git a/pym/gentoolkit/equery/__init__.py b/pym/gentoolkit/equery/__init__.py index 6bb04a9..c270eb9 100644 --- a/pym/gentoolkit/equery/__init__.py +++ b/pym/gentoolkit/equery/__init__.py @@ -333,7 +333,7 @@ def print_version(): """Print the version of this tool to the console.""" try: - with open('/etc/gentoolkit-version') as gentoolkit_version: + with open('/usr/share/gentoolkit/VERSION') as gentoolkit_version: version = gentoolkit_version.read().strip() except IOError, err: pp.die(2, str(err)) -- 2.26.2