From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9EF781381F3 for ; Tue, 18 Dec 2012 10:42:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 49FA321C0B6; Tue, 18 Dec 2012 10:42:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C9DEA21C0B6 for ; Tue, 18 Dec 2012 10:42:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B389633DA92 for ; Tue, 18 Dec 2012 10:42:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D3B3DE543C for ; Tue, 18 Dec 2012 10:42:00 +0000 (UTC) From: "Paul Varner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Paul Varner" Message-ID: <1355827256.8745911eb903f1da301d99d5949f655b0190ca6f.fuzzyray@gentoo> Subject: [gentoo-commits] proj/gentoolkit:gentoolkit commit in: / X-VCS-Repository: proj/gentoolkit X-VCS-Files: setup.py X-VCS-Directories: / X-VCS-Committer: fuzzyray X-VCS-Committer-Name: Paul Varner X-VCS-Revision: 8745911eb903f1da301d99d5949f655b0190ca6f X-VCS-Branch: gentoolkit Date: Tue, 18 Dec 2012 10:42:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: daad02d1-fcd8-4e02-93c6-334d8a90c5dd X-Archives-Hash: 3659205392ae0ed279a37e5c82d2a003 commit: 8745911eb903f1da301d99d5949f655b0190ca6f Author: Paul Varner gentoo org> AuthorDate: Tue Dec 18 10:40:56 2012 +0000 Commit: Paul Varner gentoo org> CommitDate: Tue Dec 18 10:40:56 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=8745911e Fix setup.py so that either VERSION or PVR will set the version. This fixes the issue with egg-info always having a version number of 9999. Fix is from Brian Dolbec courtesy of mirrorselect. --- setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py index 1efba94..e50d76f 100755 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ import io sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pym')) -__version__ = os.getenv('VERSION', default='9999') +__version__ = os.getenv('VERSION', default=os.getenv('PVR', default='9999')) cwd = os.getcwd()