[or-cvs] r23882: {arm} Hotfixes for a couple issues discovered in the release and r (in arm: release release/src release/src/interface resources resources/build/debian resources/build/redhat trunk trunk/src trunk/src/interface)
Damian Johnson
atagar1 at gmail.com
Wed Dec 1 03:55:25 UTC 2010
Author: atagar
Date: 2010-12-01 03:55:25 +0000 (Wed, 01 Dec 2010)
New Revision: 23882
Added:
arm/resources/rpm-prep.sh
Modified:
arm/release/setup.py
arm/release/src/interface/controller.py
arm/release/src/version.py
arm/resources/build/debian/changelog
arm/resources/build/redhat/MANIFEST
arm/resources/build/redhat/make-rpm
arm/resources/deb-prep.sh
arm/trunk/setup.py
arm/trunk/src/interface/controller.py
arm/trunk/src/version.py
Log:
Hotfixes for a couple issues discovered in the release and repairing the rpm build (not quite working yet, though).
fix: install script was failing to make the temporary directory for the compressed man page
fix: a torrc validation log entries had a typo
Modified: arm/release/setup.py
===================================================================
--- arm/release/setup.py 2010-11-29 07:16:26 UTC (rev 23881)
+++ arm/release/setup.py 2010-12-01 03:55:25 UTC (rev 23882)
@@ -39,7 +39,13 @@
# temporary destination for the man page guarenteed to be unoccupied (to
# avoid conflicting with files that are already there)
- manOutputFile = gzip.open(tempfile.mktemp("/arm.1.gz"), 'wb')
+ tmpFilename = tempfile.mktemp("/arm.1.gz")
+
+ # make dir if the path doesn't already exist
+ baseDir = os.path.dirname(tmpFilename)
+ if not os.path.exists(baseDir): os.makedirs(baseDir)
+
+ manOutputFile = gzip.open(tmpFilename, 'wb')
manOutputFile.write(manContents)
manOutputFile.close()
Modified: arm/release/src/interface/controller.py
===================================================================
--- arm/release/src/interface/controller.py 2010-11-29 07:16:26 UTC (rev 23881)
+++ arm/release/src/interface/controller.py 2010-12-01 03:55:25 UTC (rev 23882)
@@ -492,9 +492,9 @@
if defaultOptions:
if len(defaultOptions) > 1:
- msg += "\n- entries match their default values"
+ msg += "\n- entries match their default values: "
else:
- msg += "\n- entry matches its default value"
+ msg += "\n- entry matches its default value: "
defaultOptions.sort()
msg += ", ".join(defaultOptions)
Modified: arm/release/src/version.py
===================================================================
--- arm/release/src/version.py 2010-11-29 07:16:26 UTC (rev 23881)
+++ arm/release/src/version.py 2010-12-01 03:55:25 UTC (rev 23882)
@@ -2,6 +2,6 @@
Provides arm's version and release date.
"""
-VERSION = '1.4.0'
-LAST_MODIFIED = "November 27, 2010"
+VERSION = '1.4.0-2'
+LAST_MODIFIED = "November 30, 2010"
Modified: arm/resources/build/debian/changelog
===================================================================
--- arm/resources/build/debian/changelog 2010-11-29 07:16:26 UTC (rev 23881)
+++ arm/resources/build/debian/changelog 2010-12-01 03:55:25 UTC (rev 23882)
@@ -1,3 +1,9 @@
+tor-arm (1.4.0-1) unstable; urgency=low
+
+ * Upstream release 1.4.0.
+
+ -- Damian Johnson <atagar at torproject.org> Tue, 30 Nov 2010 22:30:43 -0700
+
tor-arm (1.3.7-1) unstable; urgency=low
* Initial release (upstream version 1.3.7-1, closes: #603056).
Modified: arm/resources/build/redhat/MANIFEST
===================================================================
--- arm/resources/build/redhat/MANIFEST 2010-11-29 07:16:26 UTC (rev 23881)
+++ arm/resources/build/redhat/MANIFEST 2010-12-01 03:55:25 UTC (rev 23882)
@@ -16,6 +16,7 @@
src/TorCtl/TorCtl.py
src/TorCtl/TorUtil.py
src/TorCtl/__init__.py
+src/TorCtl/LICENSE
src/interface/__init__.py
src/interface/confPanel.py
src/interface/connPanel.py
Modified: arm/resources/build/redhat/make-rpm
===================================================================
--- arm/resources/build/redhat/make-rpm 2010-11-29 07:16:26 UTC (rev 23881)
+++ arm/resources/build/redhat/make-rpm 2010-12-01 03:55:25 UTC (rev 23882)
@@ -1,5 +1,5 @@
#!/bin/sh
-cp debian/MANIFEST ./
+cp redhat/MANIFEST ./
python setup.py bdist_rpm
# cleans up after rpm build
Modified: arm/resources/deb-prep.sh
===================================================================
--- arm/resources/deb-prep.sh 2010-11-29 07:16:26 UTC (rev 23881)
+++ arm/resources/deb-prep.sh 2010-12-01 03:55:25 UTC (rev 23882)
@@ -1,19 +1,19 @@
#!/bin/sh
# Creates a release directory that's ready to make a debian build. From here
# simply run:
-# cd release_build
+# cd release_deb
# ./debian/make-deb
# alternate (works, but svn export is simpler):
# tar czf tor-arm_1.3.7.orig.tar.gz --exclude-vcs --exclude="*.pyc" -v release
-svn export release release_build
+svn export release release_deb
# edits the man page path for the sample armrc to reflect where it's located
# on debian:
# /usr/share/doc/arm/armrc.sample -> /usr/share/doc/tor-arm/armrc.sample.gz
-sed -i 's/\/usr\/share\/doc\/arm\/armrc.sample/\/usr\/share\/doc\/tor-arm\/armrc.sample.gz/g' release_build/arm.1
+sed -i 's/\/usr\/share\/doc\/arm\/armrc.sample/\/usr\/share\/doc\/tor-arm\/armrc.sample.gz/g' release_deb/arm.1
-tar czf tor-arm_1.3.7.orig.tar.gz release_build
-svn export resources/build/debian release_build/debian
+tar czf tor-arm_1.4.0.orig.tar.gz release_deb
+svn export resources/build/debian release_deb/debian
Added: arm/resources/rpm-prep.sh
===================================================================
--- arm/resources/rpm-prep.sh (rev 0)
+++ arm/resources/rpm-prep.sh 2010-12-01 03:55:25 UTC (rev 23882)
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Creates a release directory that's ready to make a red hat build. From here
+# simply run:
+# cd release_rpm
+# ./redhat/make-rpm
+
+svn export release release_rpm
+svn export resources/build/redhat release_rpm/redhat
+
Property changes on: arm/resources/rpm-prep.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: arm/trunk/setup.py
===================================================================
--- arm/trunk/setup.py 2010-11-29 07:16:26 UTC (rev 23881)
+++ arm/trunk/setup.py 2010-12-01 03:55:25 UTC (rev 23882)
@@ -39,7 +39,13 @@
# temporary destination for the man page guarenteed to be unoccupied (to
# avoid conflicting with files that are already there)
- manOutputFile = gzip.open(tempfile.mktemp("/arm.1.gz"), 'wb')
+ tmpFilename = tempfile.mktemp("/arm.1.gz")
+
+ # make dir if the path doesn't already exist
+ baseDir = os.path.dirname(tmpFilename)
+ if not os.path.exists(baseDir): os.makedirs(baseDir)
+
+ manOutputFile = gzip.open(tmpFilename, 'wb')
manOutputFile.write(manContents)
manOutputFile.close()
Modified: arm/trunk/src/interface/controller.py
===================================================================
--- arm/trunk/src/interface/controller.py 2010-11-29 07:16:26 UTC (rev 23881)
+++ arm/trunk/src/interface/controller.py 2010-12-01 03:55:25 UTC (rev 23882)
@@ -492,9 +492,9 @@
if defaultOptions:
if len(defaultOptions) > 1:
- msg += "\n- entries match their default values"
+ msg += "\n- entries match their default values: "
else:
- msg += "\n- entry matches its default value"
+ msg += "\n- entry matches its default value: "
defaultOptions.sort()
msg += ", ".join(defaultOptions)
Modified: arm/trunk/src/version.py
===================================================================
--- arm/trunk/src/version.py 2010-11-29 07:16:26 UTC (rev 23881)
+++ arm/trunk/src/version.py 2010-12-01 03:55:25 UTC (rev 23882)
@@ -2,6 +2,6 @@
Provides arm's version and release date.
"""
-VERSION = '1.4.0_dev'
-LAST_MODIFIED = "November 27, 2010"
+VERSION = '1.4.1_dev'
+LAST_MODIFIED = "November 30, 2010"
More information about the tor-commits
mailing list