[or-cvs] r24092: {arm} Hotfix to help gentoo ebuilds (https://bugs.gentoo.org/34979 (in arm/release: . src)

[Damian Johnson]

Author: atagar
Date: 2011-01-16 02:18:44 +0000 (Sun, 16 Jan 2011)
New Revision: 24092

Modified:
   arm/release/setup.py
   arm/release/src/version.py
Log:
Hotfix to help gentoo ebuilds (https://bugs.gentoo.org/349792)



Modified: arm/release/setup.py
===================================================================
--- arm/release/setup.py	2011-01-16 02:15:33 UTC (rev 24091)
+++ arm/release/setup.py	2011-01-16 02:18:44 UTC (rev 24092)
@@ -17,6 +17,23 @@
 
 docPath = "/usr/share/doc/%s" % ("tor-arm" if isDebInstall else "arm")
 
+# Allow the docPath to be overridden via a '--docPath' argument. This is to
+# support custom documentation locations on Gentoo, as discussed in:
+# https://bugs.gentoo.org/349792
+
+try:
+  docPathFlagIndex = sys.argv.index("--docPath")
+  if docPathFlagIndex < len(sys.argv) - 1:
+    docPath = sys.argv[docPathFlagIndex + 1]
+    
+    # remove the custom --docPath argument (otherwise the setup call will
+    # complain about them)
+    del sys.argv[docPathFlagIndex:docPathFlagIndex + 3]
+  else:
+    print "No path provided for --docPath"
+    sys.exit(1)
+except ValueError: pass # --docPath flag not found
+
 # Provides the configuration option to install to "/usr/share" rather than as a
 # python module. Alternatives are to either provide this as an input argument
 # (not an option for deb/rpm builds) or add a setup.cfg with:
@@ -77,8 +94,7 @@
 
 # Removes the egg_info file. Apparently it is not optional during setup
 # (hardcoded in distutils/command/install.py), nor are there any arguments to
-# bypass its creation.
-# TODO: not sure how to remove this from the deb build too...
+# bypass its creation. The deb build removes this as part of its rules script.
 eggPath = '/usr/share/arm-%s.egg-info' % VERSION
 
 if not isDebInstall and os.path.isfile(eggPath):

Modified: arm/release/src/version.py
===================================================================
--- arm/release/src/version.py	2011-01-16 02:15:33 UTC (rev 24091)
+++ arm/release/src/version.py	2011-01-16 02:18:44 UTC (rev 24092)
@@ -2,6 +2,6 @@
 Provides arm's version and release date.
 """
 
-VERSION = '1.4.1.2'
-LAST_MODIFIED = "January 12, 2011"
+VERSION = '1.4.1.3'
+LAST_MODIFIED = "January 15, 2011"