[Pkg-bazaar-commits] ./bzr-builddeb/trunk.old r272: Suggest installing bzr-svn if the package uses svn and it can't be imported.

James Westby jw+debian at jameswestby.net
Wed Dec 10 08:33:03 UTC 2008


------------------------------------------------------------
revno: 272
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Fri 2008-08-29 18:34:06 +0100
message:
  Suggest installing bzr-svn if the package uses svn and it can't be imported.
modified:
  directory.py
-------------- next part --------------
=== modified file 'directory.py'
--- a/directory.py	2008-08-29 13:22:48 +0000
+++ b/directory.py	2008-08-29 17:34:06 +0000
@@ -58,7 +58,8 @@
             version = sorted(urls,cmp=apt_pkg.VersionCompare)[0]
 
         if not version in urls:
-            raise errors.InvalidURL(path=url, extra='version %s not found' % version)
+            raise errors.InvalidURL(path=url,
+                    extra='version %s not found' % version)
         
         info("Retrieving Vcs locating from %s Debian version %s", name, version)
 
@@ -66,7 +67,14 @@
             return urls[version]["Bzr"]
 
         if "Svn" in urls[version]:
-            return urls[version]["Svn"]
+            try:
+                import bzrlib.plugins.svn
+            except ImportError:
+                info("This package uses subversion. If you would like to "
+                        "access it with bzr then please install bzr-svn "
+                        "and re-run the command.")
+            else:
+                return urls[version]["Svn"]
 
         raise errors.InvalidURL(path=url,
             extra='unsupported VCSes %r found' % urls[version].keys())



More information about the Pkg-bazaar-commits mailing list