Merge lp:~jelmer/bzr-builder/pristine-tar-upstream into lp:bzr-builder

[Jelmer Vernooij]

Support creating .orig.tar.gz / .orig.tar.bz2 files from the base branch for non-native packages. bzr-builder will look for a upstream-<VERSION> to export, where VERSION is the upstream version part extracted from the current changelog entry's version string.

Pristine tar delta information set by bzr-builddeb will be used to reconstruct the orig tarball, if present.

This adds a --allow-fallback-to-native option which makes bzr-builder force non-native packages to be native if it can not find a upstream-<VERSION> tag in the base branch. This option gives behaviour compatible with that of current bzr-builder.

[James Westby (james-w)]

Hi,

Thanks for doing this!

81 - version = base_branch.deb_version
82 - if "-" in version:
83 - version = version[:version.rindex("-")]
84 - package_basedir = "%s-%s" % (package_name, version)
85 + package_basedir = "%s-%s" % (package_name, package_version.upstream_version)

This does actually change behaviour if the version has an epoch, is that ok?

148 +def reconstruct_pristine_tar(dest, delta, dest_filename):

I guessed that these were going to come from the code you split out in bzr-builddeb.
Was that the intention?

Thanks,

James

[Jelmer Vernooij (jelmer)]

On Mon, 2011-06-06 at 16:19 +0000, James Westby wrote:
> Thanks for doing this!
My pleasure :) This should means that at least these things are out of
the way when there's some developer time available to work on the
Launchpad side of build-from-branch-into-ppa/primary.

> 81 - version = base_branch.deb_version
> 82 - if "-" in version:
> 83 - version = version[:version.rindex("-")]
> 84 - package_basedir = "%s-%s" % (package_name, version)
> 85 + package_basedir = "%s-%s" % (package_name, package_version.upstream_version)
>
> This does actually change behaviour if the version has an epoch, is that ok?
Yep, that's fine - though that's a good catch, I hadn't considered it
earlier.

> 148 +def reconstruct_pristine_tar(dest, delta, dest_filename):
>
> I guessed that these were going to come from the code you split out in bzr-builddeb.
> Was that the intention?
That was my original intention but it turned out to be a really trivial
function in the end and it could even be made shorter by using the
_run_command utility function in bzr-builder.

Cheers,

Jelmer

[James Westby (james-w)]

On Mon, 06 Jun 2011 16:57:29 -0000, Jelmer Vernooij <email address hidden> wrote:
> > 148 +def reconstruct_pristine_tar(dest, delta, dest_filename):
> >
> > I guessed that these were going to come from the code you split out in bzr-builddeb.
> > Was that the intention?
> That was my original intention but it turned out to be a really trivial
> function in the end and it could even be made shorter by using the
> _run_command utility function in bzr-builder.

Should we move _run_command to bzr-builddeb and make it smaller there
and re-use it here?

Are there drawbacks to depending on bzr-builddeb?

Thanks,

James

[Jelmer Vernooij (jelmer)]

On Mon, 2011-06-06 at 19:37 +0000, James Westby wrote:
> On Mon, 06 Jun 2011 16:57:29 -0000, Jelmer Vernooij <email address hidden> wrote:
> > > 148 +def reconstruct_pristine_tar(dest, delta, dest_filename):
> > >
> > > I guessed that these were going to come from the code you split out in bzr-builddeb.
> > > Was that the intention?
> > That was my original intention but it turned out to be a really trivial
> > function in the end and it could even be made shorter by using the
> > _run_command utility function in bzr-builder.
> Should we move _run_command to bzr-builddeb and make it smaller there
> and re-use it here?
I think it'd be reasonable to have _run_command in bzr-builddeb too.

> Are there drawbacks to depending on bzr-builddeb?
I'm not sure - I never understood why they were separate in the first
place?

The main drawback I can think of is that it makes backporting
bzr-builder to lucid-cat more problematic, but that's a minor point.

On the plus side, it would mean that we can use more convenience code
from bzr-builddeb, which would be nice.

Cheers,

Jelmer

[James Westby (james-w)]

On Mon, 06 Jun 2011 19:46:25 -0000, Jelmer Vernooij <email address hidden> wrote:
> > Are there drawbacks to depending on bzr-builddeb?
> I'm not sure - I never understood why they were separate in the first
> place?
>
> The main drawback I can think of is that it makes backporting
> bzr-builder to lucid-cat more problematic, but that's a minor point.
>
> On the plus side, it would mean that we can use more convenience code
> from bzr-builddeb, which would be nice.

They were separate mainly as the core of bzr-builder code has nothing to
do with building packages, and they started out as two separate projects
in my mind.

I wouldn't be against merging the projects, and certainly I'm for
re-using code where possible.

Do you think they should be one project?

Thanks,

James

[Jelmer Vernooij (jelmer)]

On Mon, 2011-06-06 at 20:31 +0000, James Westby wrote:
> On Mon, 06 Jun 2011 19:46:25 -0000, Jelmer Vernooij <email address hidden> wrote:
> > > Are there drawbacks to depending on bzr-builddeb?
> > I'm not sure - I never understood why they were separate in the first
> > place?
> >
> > The main drawback I can think of is that it makes backporting
> > bzr-builder to lucid-cat more problematic, but that's a minor point.
> >
> > On the plus side, it would mean that we can use more convenience code
> > from bzr-builddeb, which would be nice.
>
> They were separate mainly as the core of bzr-builder code has nothing to
> do with building packages, and they started out as two separate projects
> in my mind.
>
> I wouldn't be against merging the projects, and certainly I'm for
> re-using code where possible.
>
> Do you think they should be one project?
I think that distinction makes sense - I certainly think it would be
nice to keep the Debian-specific bits isolated.

Perhaps they can be separate projects, with bzr-builddeb as an optional
dependency for those bits ("bzr dailydeb") of bzr-builder that are
Debian-specific?

Especially now that deb-version is optional there is no reason that
things like "bzr build" couldn't be used for operations unrelated to
Debian packages.

Cheers,

Jelmer

[James Westby (james-w)]

On Mon, 06 Jun 2011 21:42:29 -0000, Jelmer Vernooij <email address hidden> wrote:
> I think that distinction makes sense - I certainly think it would be
> nice to keep the Debian-specific bits isolated.
>
> Perhaps they can be separate projects, with bzr-builddeb as an optional
> dependency for those bits ("bzr dailydeb") of bzr-builder that are
> Debian-specific?
>
> Especially now that deb-version is optional there is no reason that
> things like "bzr build" couldn't be used for operations unrelated to
> Debian packages.

That sounds like a good distinction to me.

Thanks,

James

[James Westby (james-w)]

This looks fine to me.

I'd like the longer term aim to be more code sharing where it makes
sense.

Thanks,

James

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-06-01 18:48:43 +0000
+++ cmds.py	2011-06-05 17:20:55 +0000
@@ -15,6 +15,7 @@
 
 """Subcommands provided by bzr-builder."""
 
+from base64 import standard_b64decode
 from StringIO import StringIO
 import datetime
 from email import utils
@@ -22,6 +23,7 @@
 import os
 import pwd
 import re
+import signal
 import socket
 import shutil
 import subprocess
@@ -36,6 +38,7 @@
 
 from bzrlib import (
         errors,
+        export as _mod_export,
         lazy_regex,
         trace,
         transport as _mod_transport,
@@ -193,16 +196,16 @@
     return (maintainer, email)
 
 
-def add_autobuild_changelog_entry(base_branch, basedir, distribution=None,
-        package=None, author_name=None, author_email=None,
+def add_autobuild_changelog_entry(base_branch, basedir, package,
+        distribution=None, author_name=None, author_email=None,
         append_version=None):
     """Add a new changelog entry for an autobuild.
 
     :param base_branch: Recipe base branch
     :param basedir: Base working directory
+    :param package: package name
     :param distribution: Optional distribution (defaults to last entry
         distribution)
-    :param package: Optional package name (defaults to last entry package name)
     :param author_name: Name of the build requester
     :param author_email: Email of the build requester
     :param append_version: Optional version suffix to add
@@ -225,8 +228,6 @@
     if len(cl._blocks) > 0:
         if distribution is None:
             distribution = cl._blocks[0].distributions.split()[0]
-        if package is None:
-            package = cl._blocks[0].package
     else:
         if file_found:
             if len(contents.strip()) > 0:
@@ -236,10 +237,6 @@
                 reason = "debian/changelog was empty"
         else:
             reason = "debian/changelog was not present"
-        if package is None:
-            raise errors.BzrCommandError("No previous changelog to "
-                    "take the package name from, and --package not "
-                    "specified: %s." % reason)
         if distribution is None:
             distribution = DEFAULT_UBUNTU_DISTRIBUTION
     try:
@@ -274,23 +271,21 @@
         cl_f.close()
 
 
-def calculate_package_dir(base_branch, package_name, working_basedir):
+def calculate_package_dir(package_name, package_version, working_basedir):
     """Calculate the directory name that should be used while debuilding.
 
     :param base_branch: Recipe base branch
+    :param package_version: Version of the package
     :param package_name: Package name
     :param working_basedir: Base directory
     """
-    version = base_branch.deb_version
-    if "-" in version:
-        version = version[:version.rindex("-")]
-    package_basedir = "%s-%s" % (package_name, version)
+    package_basedir = "%s-%s" % (package_name, package_version.upstream_version)
     package_dir = os.path.join(working_basedir, package_basedir)
     return package_dir
 
 
 def _run_command(command, basedir, msg, error_msg,
-        not_installed_msg=None, env=None, success_exit_codes=None):
+        not_installed_msg=None, env=None, success_exit_codes=None, indata=None):
     """ Run a command in a subprocess.
 
     :param command: list with command and parameters
@@ -300,7 +295,10 @@
         isn't available.
     :param env: Optional environment to use rather than os.environ.
     :param success_exit_codes: Exit codes to consider succesfull, defaults to [0].
+    :param indata: Data to write to standard input
     """
+    def subprocess_setup():
+        signal.signal(signal.SIGPIPE, signal.SIG_DFL)
     trace.note(msg)
     # Hide output if -q is in use.
     quiet = trace.is_quiet()
@@ -310,16 +308,17 @@
         kwargs = {}
     if env is not None:
         kwargs["env"] = env
+    trace.mutter("running: %r", command)
     try:
         proc = subprocess.Popen(command, cwd=basedir,
-                stdin=subprocess.PIPE, **kwargs)
+                stdin=subprocess.PIPE, preexec_fn=subprocess_setup, **kwargs)
     except OSError, e:
         if e.errno != errno.ENOENT:
             raise
         if not_installed_msg is None:
             raise
         raise MissingDependency(msg=not_installed_msg)
-    output = proc.communicate()
+    output = proc.communicate(indata)
     if success_exit_codes is None:
         success_exit_codes = [0]
     if proc.returncode not in success_exit_codes:
@@ -329,9 +328,13 @@
             raise errors.BzrCommandError(error_msg)
 
 
-def build_source_package(basedir):
-    command = ["/usr/bin/debuild", "--no-tgz-check", "-i", "-I", "-S",
-                    "-uc", "-us"]
+def build_source_package(basedir, tgz_check=True):
+    command = ["/usr/bin/debuild"]
+    if tgz_check:
+        command.append("--tgz-check")
+    else:
+        command.append("--no-tgz-check")
+    command.extend(["-i", "-I", "-S", "-uc", "-us"])
     _run_command(command, basedir,
         "Building the source package",
         "Failed to build the source package",
@@ -546,6 +549,59 @@
         return control["Source"]
 
 
+def reconstruct_pristine_tar(dest, delta, dest_filename):
+    """Reconstruct a pristine tarball from a directory and a delta.
+
+    :param dest: Directory to pack
+    :param delta: pristine-tar delta
+    :param dest_filename: Destination filename
+    """
+    command = ["pristine-tar", "gentar", "-",
+               os.path.abspath(dest_filename)]
+    _run_command(command, dest,
+        "Reconstructing pristine tarball",
+        "Generating tar from delta failed",
+        not_installed_msg="pristine-tar is not installed",
+        indata=delta)
+
+
+def extract_upstream_tarball(branch, package, version, dest_dir):
+    """Extract the upstream tarball from a branch.
+
+    :param branch: Branch with the upstream pristine tar data
+    :param package: Package name
+    :param version: Package version
+    :param dest_dir: Destination directory
+    """
+    tag_name = "upstream-%s" % version
+    revid = branch.tags.lookup_tag(tag_name)
+    tree = branch.repository.revision_tree(revid)
+    rev = branch.repository.get_revision(revid)
+    if 'deb-pristine-delta' in rev.properties:
+        uuencoded = rev.properties['deb-pristine-delta']
+        dest_filename = "%s_%s.orig.tar.gz" % (package, version)
+    elif 'deb-pristine-delta-bz2' in rev.properties:
+        uuencoded = rev.properties['deb-pristine-delta-bz2']
+        dest_filename = "%s_%s.orig.tar.bz2" % (package, version)
+    else:
+        uuencoded = None
+    if uuencoded is not None:
+        delta = standard_b64decode(uuencoded)
+        dest = os.path.join(dest_dir, "orig")
+        try:
+            _mod_export.export(tree, dest, format='dir')
+            reconstruct_pristine_tar(dest, delta,
+                os.path.join(dest_dir, dest_filename))
+        finally:
+            if os.path.exists(dest):
+                shutil.rmtree(dest)
+    else:
+        # Default to .tar.gz
+        dest_filename = "%s_%s.orig.tar.gz" % (package, version)
+        _mod_export.export(tree, os.path.join(dest_dir, dest_filename),
+                per_file_timestamps=True)
+
+
 class cmd_dailydeb(cmd_build):
     """Build a deb based on a 'recipe' or from a branch.
 
@@ -583,6 +639,9 @@
                         "in debian/changelog."),
                 Option("safe", help="Error if the recipe would cause"
                        " arbitrary code execution."),
+                Option("allow-fallback-to-native",
+                    help="Allow falling back to a native package if the upstream "
+                         "tarball can not be found."),
             ]
 
     takes_args = ["location", "working_basedir?"]
@@ -590,7 +649,7 @@
     def run(self, location, working_basedir=None, manifest=None,
             if_changed_from=None, package=None, distribution=None,
             dput=None, key_id=None, no_build=None, watch_ppa=False,
-            append_version=None, safe=False):
+            append_version=None, safe=False, allow_fallback_to_native=False):
 
         if dput is not None and key_id is None:
             raise errors.BzrCommandError("You must specify --key-id if you "
@@ -617,8 +676,12 @@
             if not os.path.exists(working_basedir):
                 os.makedirs(working_basedir)
         package_name = self._calculate_package_name(location, package)
-        working_directory = os.path.join(working_basedir,
-            "%s-%s" % (package_name, self._template_version))
+        if self._template_version is None:
+            working_directory = os.path.join(working_basedir,
+                "%s-direct" % (package_name,))
+        else:
+            working_directory = os.path.join(working_basedir,
+                "%s-%s" % (package_name, self._template_version))
         try:
             # we want to use a consistent package_dir always to support
             # updates in place, but debuild etc want PACKAGE-UPSTREAMVERSION
@@ -628,11 +691,13 @@
             manifest_path = os.path.join(working_directory, "debian",
                 "bzr-builder.manifest")
             build_tree(base_branch, working_directory)
-            if package is None:
-                control_path = os.path.join(working_directory, "debian", "control")
-                if not os.path.exists(control_path):
-                    raise errors.BzrCommandError("Missing debian/control file to "
-                        "read package name from.")
+            control_path = os.path.join(working_directory, "debian", "control")
+            if not os.path.exists(control_path):
+                if package is None:
+                    raise errors.BzrCommandError("No control file to "
+                            "take the package name from, and --package not "
+                            "specified.")
+            else:
                 package = debian_source_package_name(control_path)
             write_manifest_to_transport(manifest_path, base_branch,
                 possible_transports)
@@ -640,16 +705,20 @@
             if autobuild:
                 # Add changelog also substitutes {debupstream}.
                 add_autobuild_changelog_entry(base_branch, working_directory,
-                    distribution=distribution, package=package,
+                    package, distribution=distribution, 
                     append_version=append_version)
             else:
                 if append_version:
                     raise errors.BzrCommandError("--append-version only "
                         "supported for autobuild recipes (with a 'deb-version' "
                         "header)")
-            force_native_format(working_directory)
-            package_dir = calculate_package_dir(base_branch,
-                    package_name, working_basedir)
+            with open(os.path.join(working_directory, "debian", "changelog")) as cl_f:
+                contents = cl_f.read()
+            cl = changelog.Changelog(file=contents)
+            package_name = cl.package
+            package_version = cl.version
+            package_dir = calculate_package_dir(package_name, package_version,
+                working_basedir)
             # working_directory -> package_dir: after this debian stuff works.
             os.rename(working_directory, package_dir)
             if no_build:
@@ -657,8 +726,19 @@
                     write_manifest_to_transport(manifest, base_branch,
                         possible_transports)
                 return 0
+            if package_version.debian_revision is not None:
+                # Non-native package
+                try:
+                    extract_upstream_tarball(base_branch.branch, package_name,
+                        package_version.upstream_version, working_basedir)
+                except errors.NoSuchTag:
+                    if not allow_fallback_to_native:
+                        raise
+            if allow_fallback_to_native:
+                force_native_format(package_dir)
             try:
-                build_source_package(package_dir)
+                build_source_package(package_dir,
+                        tgz_check=not allow_fallback_to_native)
                 if key_id is not None:
                     sign_source_package(package_dir, key_id)
                 if dput is not None:

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2009-10-23 00:14:10 +0000
+++ tests/__init__.py	2011-06-05 17:20:55 +0000
@@ -13,8 +13,25 @@
 # You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
 from unittest import TestSuite
-from bzrlib.tests import TestUtil
+from bzrlib.tests import (
+    Feature,
+    TestUtil,
+    )
+
+
+class _PristineTarFeature(Feature):
+
+    def feature_name(self):
+        return '/usr/bin/pristine-tar'
+
+    def _probe(self):
+        return os.path.exists("/usr/bin/pristine-tar")
+
+
+PristineTarFeature = _PristineTarFeature()
+
 
 def test_suite():
     loader = TestUtil.TestLoader()

=== modified file 'tests/test_blackbox.py'
--- tests/test_blackbox.py	2011-06-05 17:20:55 +0000
+++ tests/test_blackbox.py	2011-06-05 17:20:55 +0000
@@ -13,15 +13,49 @@
 # You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from base64 import standard_b64encode
 import os
+import signal
+import subprocess
 from textwrap import dedent
 
-from bzrlib import workingtree
+from bzrlib import (
+    export as _mod_export,
+    osutils,
+    workingtree,
+    )
+from bzrlib.branch import Branch
 from bzrlib.tests import (
         TestCaseWithTransport,
         )
 
 
+from bzrlib.plugins.builder.tests import PristineTarFeature
+
+
+def make_pristine_tar_delta(dest, tarball_path):
+    """Create a pristine-tar delta for a tarball.
+
+    :param dest: Directory to generate pristine tar delta for
+    :param tarball_path: Path to the tarball
+    :return: pristine-tarball
+    """
+    def subprocess_setup():
+        signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+    # If tarball_path is relative, the cwd=dest parameter to Popen will make
+    # pristine-tar faaaail. pristine-tar doesn't use the VFS either, so we
+    # assume local paths.
+    tarball_path = osutils.abspath(tarball_path)
+    command = ["pristine-tar", "gendelta", tarball_path, "-"]
+    proc = subprocess.Popen(command, stdout=subprocess.PIPE,
+            cwd=dest, preexec_fn=subprocess_setup,
+            stderr=subprocess.PIPE)
+    (stdout, stderr) = proc.communicate()
+    if proc.returncode != 0:
+        raise Exception("Generating delta from tar failed: %s" % stderr)
+    return stdout
+
+
 class BlackboxBuilderTests(TestCaseWithTransport):
 
     if not getattr(TestCaseWithTransport, "assertPathDoesNotExist", None):
@@ -230,6 +264,40 @@
         out, err = self.run_bzr("dailydeb -q test.recipe "
                 "--manifest manifest --if-changed-from bar")
 
+    def make_upstream_version(self, version, contents,
+            pristine_tar_format=None):
+        upstream = self.make_branch_and_tree("upstream")
+        self.build_tree_contents(contents)
+        upstream.smart_add([upstream.basedir])
+        revprops = {}
+        if pristine_tar_format is not None:
+            _mod_export.export(upstream, "export")
+            if pristine_tar_format == "gz":
+                tarfile_path = "export.tar.gz"
+                _mod_export.export(upstream, tarfile_path, "tgz")
+                revprops["deb-pristine-delta"] = standard_b64encode(
+                    make_pristine_tar_delta(
+                        "export", "export.tar.gz"))
+            elif pristine_tar_format == "bz2":
+                tarfile_path = "export.tar.bz2"
+                _mod_export.export(upstream, tarfile_path, "tbz2")
+                revprops["deb-pristine-delta-bz2"] = standard_b64encode(
+                    make_pristine_tar_delta(
+                        "export", "export.tar.bz2"))
+            else:
+                raise AssertionError("unknown pristine tar format %s" %
+                    pristine_tar_format)
+        else:
+            tarfile_path = "export.tar.gz"
+            _mod_export.export(upstream, tarfile_path, "tgz")
+        tarfile_sha1 = osutils.sha_file_by_name(tarfile_path)
+        revid = upstream.commit("import upstream %s" % version,
+            revprops=revprops)
+        source = Branch.open("source")
+        source.repository.fetch(upstream.branch.repository)
+        source.tags.set_tag("upstream-%s" % version, revid)
+        return tarfile_sha1
+
     def make_simple_package(self):
         source = self.make_branch_and_tree("source")
         self.build_tree(["source/a", "source/debian/"])
@@ -254,7 +322,7 @@
                 "--manifest manifest --no-build working")
         new_cl_contents = ("package (1) unstable; urgency=low\n\n"
                 "  * Auto build.\n\n -- M. Maintainer <[e-mail]>  ")
-        f = open("working/test-1/debian/changelog")
+        f = open("working/package-1/debian/changelog")
         try:
             actual_cl_contents = f.read()
         finally:
@@ -283,7 +351,8 @@
         self.make_simple_package()
         self.build_tree_contents([("test.recipe", "# bzr-builder format 0.1 "
                     "deb-version {debupstream}-2\nsource 1\n")])
-        out, err = self.run_bzr("dailydeb -q test.recipe working")
+        out, err = self.run_bzr(
+            "dailydeb --allow-fallback-to-native -q test.recipe working")
         new_cl_contents = ("package (0.1-2) unstable; urgency=low\n\n"
                 "  * Auto build.\n\n -- M. Maintainer <[e-mail]>  ")
         f = open("working/test-{debupstream}-2/debian/changelog")
@@ -342,12 +411,64 @@
         source.commit("set source format")
         return source
 
+    def test_cmd_dailydeb_missing_orig_tarball(self):
+        self.make_simple_quilt_package()
+        self.build_tree_contents([("test.recipe", "# bzr-builder format 0.3 "
+                    "deb-version 1-1\nsource 1\n")])
+        out, err = self.run_bzr(
+            "dailydeb -q test.recipe working",
+            retcode=3)
+        self.assertEquals("", out)
+        self.assertEquals('bzr: ERROR: No such tag: upstream-1\n', err)
+
+    def test_cmd_dailydeb_with_orig_tarball(self):
+        self.make_simple_package()
+        self.make_upstream_version("0.1", [("upstream/file", "content\n")])
+        self.build_tree_contents([("test.recipe", "# bzr-builder format 0.3 "
+                    "deb-version 0.1-1\nsource\n")])
+        out, err = self.run_bzr(
+            "dailydeb -q test.recipe working",
+            retcode=0)
+        self.assertPathExists("working/package_0.1.orig.tar.gz")
+        self.assertPathExists("working/package_0.1-1.diff.gz")
+
+    def test_cmd_dailydeb_with_pristine_orig_gz_tarball(self):
+        self.requireFeature(PristineTarFeature)
+        self.make_simple_package()
+        pristine_tar_sha1 = self.make_upstream_version("0.1",
+            [("upstream/file", "content\n")], pristine_tar_format="gz")
+        self.build_tree_contents([("test.recipe", "# bzr-builder format 0.3 "
+                    "deb-version 0.1-1\nsource\n")])
+        out, err = self.run_bzr("dailydeb -q test.recipe working",
+            retcode=0)
+        self.assertPathExists("working/package_0.1.orig.tar.gz")
+        self.assertPathExists("working/package_0.1-1.diff.gz")
+        self.assertEquals(
+            osutils.sha_file_by_name("working/package_0.1.orig.tar.gz"),
+            pristine_tar_sha1)
+
+    def test_cmd_dailydeb_with_pristine_orig_bz2_tarball(self):
+        self.requireFeature(PristineTarFeature)
+        self.make_simple_quilt_package()
+        pristine_tar_sha1 = self.make_upstream_version("0.1",
+            [("upstream/file", "content\n")], pristine_tar_format="bz2")
+        self.build_tree_contents([("test.recipe", "# bzr-builder format 0.3 "
+                    "deb-version 0.1-1\nsource\n")])
+        out, err = self.run_bzr("dailydeb -q test.recipe working",
+            retcode=0)
+        self.assertPathExists("working/package_0.1.orig.tar.bz2")
+        self.assertPathExists("working/package_0.1-1.debian.tar.gz")
+        self.assertEquals(
+            osutils.sha_file_by_name("working/package_0.1.orig.tar.bz2"),
+            pristine_tar_sha1)
+
     def test_cmd_dailydeb_force_native(self):
         self.make_simple_quilt_package()
         self.build_tree_contents([("test.recipe", "# bzr-builder format 0.3 "
                     "deb-version 1\nsource 2\n")])
         out, err = self.run_bzr(
-            "dailydeb -q test.recipe working", retcode=0)
+            "dailydeb --allow-fallback-to-native -q test.recipe working",
+            retcode=0)
         self.assertFileEqual("3.0 (native)\n",
             "working/test-1/debian/source/format")
 
@@ -361,7 +482,8 @@
         source.add(["debian/patches", "debian/patches/series"])
         source.commit("add patches")
         out, err = self.run_bzr(
-            "dailydeb -q test.recipe working", retcode=0)
+            "dailydeb --allow-fallback-to-native -q test.recipe working",
+            retcode=0)
         self.assertFileEqual("3.0 (native)\n",
             "working/test-1/debian/source/format")
         self.assertPathDoesNotExist("working/test-1/debian/patches")
@@ -388,7 +510,8 @@
         self.build_tree_contents([("test.recipe", "# bzr-builder format 0.3 "
                     "deb-version 1\nsource\n")])
         out, err = self.run_bzr(
-            "dailydeb -q test.recipe working", retcode=0)
+            "dailydeb --allow-fallback-to-native -q test.recipe working",
+            retcode=0)
         self.assertFileEqual("3.0 (native)\n",
             "working/test-1/debian/source/format")
         self.assertFileEqual("new-contents\n",
@@ -415,8 +538,10 @@
         source.commit("add patch")
 
         self.build_tree_contents([("test.recipe", "# bzr-builder format 0.3 "
-                    "deb-version 1\nsource 3\n")])
-        out, err = self.run_bzr("dailydeb -q test.recipe working", retcode=3)
+                    "deb-version 1-1\nsource 3\n")])
+        out, err = self.run_bzr(
+            "dailydeb --allow-fallback-to-native -q test.recipe working",
+            retcode=3)
         self.assertContainsRe(err, "bzr: ERROR: Failed to apply quilt patches")
 
     def test_unknown_source_format(self):
@@ -430,5 +555,5 @@
         self.build_tree_contents([("test.recipe", "# bzr-builder format 0.3 "
                     "deb-version 1\nsource\n")])
         out, err = self.run_bzr(
-            "dailydeb -q test.recipe working", retcode=3)
+            "dailydeb --allow-fallback-to-native -q test.recipe working", retcode=3)
         self.assertEquals(err, "bzr: ERROR: Unknown source format 2.0\n")