allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject git commit: [#7134] Fixed re-introduced AttributeError
Date Thu, 27 Mar 2014 21:05:35 GMT
Repository: allura
Updated Branches:
  refs/heads/master acc8e3739 -> b9d05c90c


[#7134] Fixed re-introduced AttributeError

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/b9d05c90
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/b9d05c90
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/b9d05c90

Branch: refs/heads/master
Commit: b9d05c90c0923cdd04fe1d48a7274b12935b2bec
Parents: acc8e37
Author: Cory Johns <cjohns@slashdotmedia.com>
Authored: Thu Mar 27 21:03:37 2014 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Thu Mar 27 21:03:37 2014 +0000

----------------------------------------------------------------------
 Allura/allura/lib/repository.py | 2 +-
 ForgeSVN/forgesvn/svn_main.py   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/b9d05c90/Allura/allura/lib/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/repository.py b/Allura/allura/lib/repository.py
index f155f7f..33c3904 100644
--- a/Allura/allura/lib/repository.py
+++ b/Allura/allura/lib/repository.py
@@ -271,7 +271,7 @@ class RepoAdminController(DefaultAdminController):
     def set_checkout_url(self, **post_data):
         external_checkout_url = (post_data.get('external_checkout_url') or '').strip()
         if 'external_checkout_url' not in c.form_errors:
-            if self.app.config.options.external_checkout_url != external_checkout_url:
+            if (self.app.config.options.get('external_checkout_url') or '') != external_checkout_url:
                 self.app.config.options.external_checkout_url = external_checkout_url
                 flash("External checkout URL successfully changed")
         else:

http://git-wip-us.apache.org/repos/asf/allura/blob/b9d05c90/ForgeSVN/forgesvn/svn_main.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/svn_main.py b/ForgeSVN/forgesvn/svn_main.py
index 7d7a2f5..5dda325 100644
--- a/ForgeSVN/forgesvn/svn_main.py
+++ b/ForgeSVN/forgesvn/svn_main.py
@@ -130,14 +130,14 @@ class SVNRepoAdminController(RepoAdminController):
                                                (self.app.repo.fs_path,
                                                 self.app.repo.name,
                                                 checkout_url)):
-            if self.app.config.options.checkout_url != checkout_url:
+            if (self.app.config.options.get('checkout_url') or '') != checkout_url:
                 self.app.config.options.checkout_url = checkout_url
                 flash("Checkout URL successfully changed")
         else:
             flash("%s is not a valid path for this repository" %
                   checkout_url, "error")
         if 'external_checkout_url' not in c.form_errors:
-            if self.app.config.options.external_checkout_url != external_checkout_url:
+            if (self.app.config.options.get('external_checkout_url') or '') != external_checkout_url:
                 self.app.config.options.external_checkout_url = external_checkout_url
                 flash("External checkout URL successfully changed")
         else:


Mime
View raw message