Merge lp:~jelmer/launchpad/601013-bzr-builder-import into lp:launchpad

[Jelmer Vernooij]

Support use of newer versions of python-debian and bzr-builder.

Trivial change to consistently import RecipeParser from bzrlib.plugins.builder.recipe and not from bzrlib.plugins.builder.__init__ in some places. The latter module no longer imports RecipeParser from recipe.py in newer versions of bzr-builder.

[Brad Crittenden (bac)]

Hi Jelmer,

As we discussed on IRC, please add an XXX comment regarding the import of Dsc. It should state the condition for removing the alternate location. Will that be when the production machines move to Maverick or a PPA is available?

Also, please make sure your comments are properly punctuated...i.e. full-stop.

review: Approve (code)

=== modified file 'lib/lp/code/model/sourcepackagerecipe.py'
--- lib/lp/code/model/sourcepackagerecipe.py	2010-06-17 14:54:24 +0000
+++ lib/lp/code/model/sourcepackagerecipe.py	2010-07-19 15:34:47 +0000
@@ -10,7 +10,7 @@
     'SourcePackageRecipe',
     ]
 
-from bzrlib.plugins.builder import RecipeParser
+from bzrlib.plugins.builder.recipe import RecipeParser
 from lazr.delegates import delegates
 
 from storm.locals import (

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2010-07-16 13:34:38 +0000
+++ lib/lp/registry/model/person.py	2010-07-19 15:34:47 +0000
@@ -35,7 +35,7 @@
 import time
 import weakref
 
-from bzrlib.plugins.builder import RecipeParser
+from bzrlib.plugins.builder.recipe import RecipeParser
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.interface import alsoProvides, implementer, implements
 from zope.component import adapter, getUtility

=== modified file 'scripts/ftpmaster-tools/sync-source.py'
--- scripts/ftpmaster-tools/sync-source.py	2010-05-19 18:07:56 +0000
+++ scripts/ftpmaster-tools/sync-source.py	2010-07-19 15:34:47 +0000
@@ -18,7 +18,16 @@
 
 import apt_pkg
 import commands
-from debian_bundle.deb822 import Dsc
+try:
+    from debian.deb822 import Dsc
+except ImportError:
+    # In older versions of python-debian the main package was named
+    # debian_bundle
+    # XXX: Remove this when an up to date version of python-debian lands in
+    # the PPA or Ubuntu. Maverick will be the first release that has an
+    # up to date version of python-debian.
+    from debian_bundle.deb822 import Dsc
+
 import errno
 import optparse
 import os