]> arthur.barton.de Git - bup.git/commitdiff
client.py: raising a particular rare exception caused a syntax error.
authorAvery Pennarun <apenwarr@gmail.com>
Wed, 14 Jul 2010 06:31:44 +0000 (02:31 -0400)
committerAvery Pennarun <apenwarr@gmail.com>
Wed, 14 Jul 2010 06:33:04 +0000 (02:33 -0400)
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
lib/bup/client.py

index e471cf59b0aac3199d577fe2b928480518450081..a642e4db411980e6a755e4f6cf7bac74f17f3b85 100644 (file)
@@ -48,16 +48,16 @@ class Client:
         self.cachedir = git.repo('index-cache/%s'
                                  % re.sub(r'[^@\w]', '_', 
                                           "%s:%s" % (host, dir)))
-        try:
-            if is_reverse:
-                self.pout = os.fdopen(3, 'rb')
-                self.pin = os.fdopen(4, 'wb')
-            else:
+        if is_reverse:
+            self.pout = os.fdopen(3, 'rb')
+            self.pin = os.fdopen(4, 'wb')
+        else:
+            try:
                 self.p = ssh.connect(host, 'server')
                 self.pout = self.p.stdout
                 self.pin = self.p.stdin
-        except OSError, e:
-            raise ClientError, 'exec %r: %s' % (argv[0], e), sys.exc_info()[2]
+            except OSError, e:
+                raise ClientError, 'connect: %s' % e, sys.exc_info()[2]
         self.conn = Conn(self.pout, self.pin)
         if dir:
             dir = re.sub(r'[\r\n]', ' ', dir)