From: Karl Hasselström <kha@treskal.com>
Date: Thu, 22 Jan 2009 22:57:01 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: v0.15-rc1~59
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/a1d6a0811bac0329f50ffa4742cf7894390104bf?hp=d3b31eeac6c6fba9352188755164f556faf56e59

Merge branch 'stable'

* stable:
  stgit.namelength is an integer
  Return None instead of crashing on undefined integer config items
---

diff --git a/stgit/config.py b/stgit/config.py
index 9bfdd52..05ef624 100644
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -63,7 +63,9 @@ class GitConfig:
 
     def getint(self, name):
         value = self.get(name)
-        if value.isdigit():
+        if value == None:
+            return None
+        elif value.isdigit():
             return int(value)
         else:
             raise GitConfigException, 'Value for "%s" is not an integer: "%s"' % (name, value)
diff --git a/stgit/utils.py b/stgit/utils.py
index 81035a5..1fa96c2 100644
--- a/stgit/utils.py
+++ b/stgit/utils.py
@@ -215,7 +215,7 @@ def patch_name_from_msg(msg):
     if not msg:
         return None
 
-    name_len = config.get('stgit.namelength')
+    name_len = config.getint('stgit.namelength')
     if not name_len:
         name_len = 30