[tor-commits] [gettor/master] Fix a bug in macosx package handling

[kaner at torproject.org]

commit 660743256d2c7039be5c35515775598636fdc58e
Author: Christian Fromme <kaner at strace.org>
Date:   Sat Sep 3 20:46:56 2011 +0200

    Fix a bug in macosx package handling
    Fix a bug in delay alert sending
---
 lib/gettor/filters.py   |    2 +-
 lib/gettor/responses.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gettor/filters.py b/lib/gettor/filters.py
index e902964..0e82686 100644
--- a/lib/gettor/filters.py
+++ b/lib/gettor/filters.py
@@ -25,7 +25,7 @@ def doPackageHacks(packageName, locale):
     if packageName == "windows" \
            or packageName == "linux-i386" \
            or packageName == "linux-x86_64" \
-           or packageName == "osx-i386":
+           or packageName == "macosx-i386":
         # "windows" => "windows_de"
         packageName += "_" + locale
 
diff --git a/lib/gettor/responses.py b/lib/gettor/responses.py
index e8dcc17..d293b23 100644
--- a/lib/gettor/responses.py
+++ b/lib/gettor/responses.py
@@ -360,7 +360,7 @@ class Response:
             packageInfo = "%s [%d parts]" \
                            % (self.reqInfo['package'], packageCount)
         else:
-            packageInfo = self.reqInfo['package']
+            packageInfo = "%s" % self.reqInfo['package']
 
         logging.info("Sending delay alert to %s" % self.reqInfo['hashed_user'])
         return self.sendTextEmail(getDelayAlertMsg(self.t, packageInfo))