[tor-commits] [arm/master] Triggering deb-build logic when in "release_deb"

sebastian at torproject.org sebastian at torproject.org
Sun Apr 24 05:55:02 UTC 2011


commit 8b8568eda8145f6c2ab4295a7924a63a7617ff39
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Apr 21 09:38:03 2011 -0700

    Triggering deb-build logic when in "release_deb"
    
    The deb-prep.sh script makes a release_deb directory in which the build takes
    place. Triggering off of tor-arm is insufficient to catch all of the calls to
    setup.py while making a deb, causing it to error from TorCtl being missing.
---
 setup.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/setup.py b/setup.py
index 39497aa..9777da1 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ from distutils.core import setup
 
 isDebInstall = False
 for arg in sys.argv:
-  if "tor-arm" in arg:
+  if "tor-arm" in arg or "release_deb" in arg:
     isDebInstall = True
     break
 





More information about the tor-commits mailing list