allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [03/11] git commit: [#7388] ticket:591 Fix indentation
Date Fri, 23 May 2014 17:54:56 GMT
[#7388] ticket:591 Fix indentation


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

Branch: refs/heads/master
Commit: e59920942cc283e8319aea3f4623ae6f97f047b6
Parents: 102fdb4
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Fri May 16 11:13:40 2014 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri May 23 17:53:44 2014 +0000

----------------------------------------------------------------------
 Allura/allura/lib/plugin.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/e5992094/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index 96cc870..4575ab7 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -332,19 +332,19 @@ class LdapAuthenticationProvider(AuthenticationProvider):
         return result
 
     def upload_sshkey(self, username, pubkey):
-            if not asbool(config.get('auth.ldap.use_schroot', True)):
-                raise NotImplemented, 'SSH keys are not supported'
-
-            argv = ('schroot -d / -c %s -u root /ldap-userconfig.py upload %s' % (
-                config['auth.ldap.schroot_name'], username)).split() + [pubkey]
-            p = subprocess.Popen(
-                argv, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            rc = p.wait()
-            if rc != 0:
-                errmsg = p.stdout.read()
-                log.exception('Error uploading public SSH key for %s: %s',
-                              username, errmsg)
-                assert False, errmsg
+        if not asbool(config.get('auth.ldap.use_schroot', True)):
+            raise NotImplemented, 'SSH keys are not supported'
+
+        argv = ('schroot -d / -c %s -u root /ldap-userconfig.py upload %s' % (
+            config['auth.ldap.schroot_name'], username)).split() + [pubkey]
+        p = subprocess.Popen(
+            argv, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        rc = p.wait()
+        if rc != 0:
+            errmsg = p.stdout.read()
+            log.exception('Error uploading public SSH key for %s: %s',
+                          username, errmsg)
+            assert False, errmsg
 
     def _get_salt(self, length):
         def random_char():


Mime
View raw message