Rev 2607: Fix unbound variable in _create_prefix (thanks vila) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Jul 12 11:49:01 BST 2007


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2607
revision-id: pqm at pqm.ubuntu.com-20070712104858-axdt2sml59kw4fjg
parent: pqm at pqm.ubuntu.com-20070712094937-rw5qbi81enh0pvhw
parent: mbp at sourcefrog.net-20070712085555-qfizepdt97bqubek
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-12 11:48:58 +0100
message:
  Fix unbound variable in _create_prefix (thanks vila)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 2604.1.1
    merged: mbp at sourcefrog.net-20070712085555-qfizepdt97bqubek
    parent: pqm at pqm.ubuntu.com-20070712075207-pgz7ur4rxmklmrxr
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Thu 2007-07-12 18:55:55 +1000
    message:
      Fix unbound variable in _create_prefix (thanks vila)
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-07-12 09:49:37 +0000
+++ b/bzrlib/builtins.py	2007-07-12 10:48:58 +0000
@@ -755,7 +755,6 @@
                         "\nYou may supply --create-prefix to create all"
                         " leading parent directories."
                         % location)
-
                 _create_prefix(to_transport)
 
             # Now the target directory exists, but doesn't have a .bzr
@@ -3797,9 +3796,9 @@
     while True:
         new_transport = cur_transport.clone('..')
         if new_transport.base == cur_transport.base:
-            raise errors.BzrCommandError("Failed to create path"
-                                         " prefix for %s."
-                                         % location)
+            raise errors.BzrCommandError(
+                "Failed to create path prefix for %s."
+                % cur_transport.base)
         try:
             new_transport.mkdir('.')
         except errors.NoSuchFile:
@@ -3807,12 +3806,12 @@
             cur_transport = new_transport
         else:
             break
-
     # Now we only need to create child directories
     while needed:
         cur_transport = needed.pop()
         cur_transport.ensure_base()
 
+
 # Compatibility
 merge = _merge_helper
 




More information about the bazaar-commits mailing list