commit 79b7e13a0d6050f924b56ea8e62ecbf826917dbd Author: Damian Johnson <atagar@torproject.org> Date: Wed Dec 1 03:55:25 2010 +0000 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 svn:r23882 --- setup.py | 8 +++++++- src/interface/controller.py | 4 ++-- src/version.py | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 57a71da..d11080f 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,13 @@ if "install" in sys.argv: # 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() diff --git a/src/interface/controller.py b/src/interface/controller.py index a90bd85..d3fe1d6 100644 --- a/src/interface/controller.py +++ b/src/interface/controller.py @@ -492,9 +492,9 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): 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) diff --git a/src/version.py b/src/version.py index a35c4ee..fc30f0b 100644 --- a/src/version.py +++ b/src/version.py @@ -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"