Merge lp:~jelmer/bzr-builder/deb-util into lp:bzr-builder

[Jelmer Vernooij]

Move debian-related code out of cmds.py into deb_util.py.

This is done in preparation of dropping the hard dependency of bzr-builder on
python-debian, as the "bzr build" command is generic and should not
require anything debian-specific. (bug 824208)

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-11-10 17:47:41 +0000
+++ cmds.py	2011-12-15 16:22:26 +0000
@@ -15,60 +15,31 @@
 
 """Subcommands provided by bzr-builder."""
 
-from base64 import standard_b64decode
 from StringIO import StringIO
 import datetime
-from email import utils
-import errno
 import os
-import signal
 import shutil
-import subprocess
 import tempfile
 
-try:
-    from debian import changelog, deb822
-except ImportError:
-    # In older versions of python-debian the main package was named 
-    # debian_bundle
-    from debian_bundle import changelog, deb822
-
-try:
-    get_maintainer = changelog.get_maintainer
-except AttributeError:
-    # Implementation of get_maintainer was added after 0.1.18 so import same
-    # function from backports module if python-debian doesn't have it.
-    from bzrlib.plugins.builder.backports import get_maintainer
-
 from bzrlib import (
-        errors,
-        export as _mod_export,
-        lazy_regex,
-        osutils,
-        trace,
-        transport as _mod_transport,
-        urlutils,
-        )
+    errors,
+    lazy_regex,
+    trace,
+    transport as _mod_transport,
+    urlutils,
+    )
 from bzrlib.branch import Branch
 from bzrlib.commands import Command
 from bzrlib.option import Option
 
 from bzrlib.plugins.builder.recipe import (
-        BaseRecipeBranch,
-        build_tree,
-        RecipeParser,
-        resolve_revisions,
-        SAFE_INSTRUCTIONS,
-        SubstitutionUnavailable,
-        )
-
-
-# The default distribution used by add_autobuild_changelog_entry()
-DEFAULT_UBUNTU_DISTRIBUTION = "lucid"
-
-
-class MissingDependency(errors.BzrError):
-    pass
+    BaseRecipeBranch,
+    build_tree,
+    RecipeParser,
+    resolve_revisions,
+    SAFE_INSTRUCTIONS,
+    )
+
 
 
 def write_manifest_to_transport(location, base_branch,
@@ -135,233 +106,6 @@
     return old_recipe
 
 
-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 author_name: Name of the build requester
-    :param author_email: Email of the build requester
-    :param append_version: Optional version suffix to add
-    """
-    debian_dir = os.path.join(basedir, "debian")
-    if not os.path.exists(debian_dir):
-        os.makedirs(debian_dir)
-    cl_path = os.path.join(debian_dir, "changelog")
-    file_found = False
-    if os.path.exists(cl_path):
-        file_found = True
-        cl_f = open(cl_path)
-        try:
-            contents = cl_f.read()
-        finally:
-            cl_f.close()
-        cl = changelog.Changelog(file=contents)
-    else:
-        cl = changelog.Changelog()
-    if len(cl._blocks) > 0:
-        if distribution is None:
-            distribution = cl._blocks[0].distributions.split()[0]
-    else:
-        if file_found:
-            if len(contents.strip()) > 0:
-                reason = ("debian/changelog didn't contain any "
-                         "parseable stanzas")
-            else:
-                reason = "debian/changelog was empty"
-        else:
-            reason = "debian/changelog was not present"
-        if distribution is None:
-            distribution = DEFAULT_UBUNTU_DISTRIBUTION
-    if base_branch.format in (0.1, 0.2, 0.3):
-        try:
-            base_branch.substitute_changelog_vars(None, cl)
-        except SubstitutionUnavailable, e:
-            raise errors.BzrCommandError("No previous changelog to "
-                    "take the upstream version from as %s was "
-                    "used: %s: %s." % (e.name, e.reason, reason))
-    # Use debian packaging environment variables
-    # or default values if they don't exist
-    if author_name is None or author_email is None:
-        author_name, author_email = get_maintainer()
-        # The python-debian package breaks compatibility at version 0.1.20 by
-        # switching to expecting (but not checking for) unicode rather than
-        # bytestring inputs. Detect this and decode environment if needed.
-        if getattr(changelog.Changelog, "__unicode__", None) is not None:
-            enc = osutils.get_user_encoding()
-            author_name = author_name.decode(enc)
-            author_email = author_email.decode(enc)
-    author = "%s <%s>" % (author_name, author_email)
-
-    date = utils.formatdate(localtime=True)
-    version = base_branch.deb_version
-    if append_version is not None:
-        version += append_version
-    try:
-        changelog.Version(version)
-    except (changelog.VersionError, ValueError), e:
-        raise errors.BzrCommandError("Invalid deb-version: %s: %s"
-                % (version, e))
-    cl.new_block(package=package, version=version,
-            distributions=distribution, urgency="low",
-            changes=['', '  * Auto build.', ''],
-            author=author, date=date)
-    cl_f = open(cl_path, 'wb')
-    try:
-        cl.write_to_open_file(cl_f)
-    finally:
-        cl_f.close()
-
-
-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
-    """
-    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, indata=None):
-    """ Run a command in a subprocess.
-
-    :param command: list with command and parameters
-    :param msg: message to display to the user
-    :param error_msg: message to display if something fails.
-    :param not_installed_msg: the message to display if the command
-        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()
-    if quiet:
-        kwargs = {"stderr": subprocess.STDOUT, "stdout": subprocess.PIPE}
-    else:
-        kwargs = {}
-    if env is not None:
-        kwargs["env"] = env
-    trace.mutter("running: %r", command)
-    try:
-        proc = subprocess.Popen(command, cwd=basedir,
-                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(indata)
-    if success_exit_codes is None:
-        success_exit_codes = [0]
-    if proc.returncode not in success_exit_codes:
-        if quiet:
-            raise errors.BzrCommandError("%s: %s" % (error_msg, output))
-        else:
-            raise errors.BzrCommandError(error_msg)
-
-
-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",
-        not_installed_msg="debuild is not installed, please install "
-            "the devscripts package.")
-
-
-def get_source_format(path):
-    """Retrieve the source format name from a package.
-
-    :param path: Path to the package
-    :return: String with package format
-    """
-    source_format_path = os.path.join(path, "debian", "source", "format")
-    if not os.path.exists(source_format_path):
-        return "1.0"
-    f = open(source_format_path, 'r')
-    try:
-        return f.read().strip()
-    finally:
-        f.close()
-
-
-def convert_3_0_quilt_to_native(path):
-    """Convert a package in 3.0 (quilt) format to 3.0 (native).
-
-    This applies all patches in the package and updates the 
-    debian/source/format file.
-
-    :param path: Path to the package on disk
-    """
-    path = os.path.abspath(path)
-    patches_dir = os.path.join(path, "debian", "patches")
-    series_file = os.path.join(patches_dir, "series")
-    if os.path.exists(series_file):
-        _run_command(["quilt", "push", "-a", "-v"], path,
-            "Applying quilt patches",
-            "Failed to apply quilt patches",
-            not_installed_msg="quilt is not installed, please install it.",
-            env={"QUILT_SERIES": series_file, "QUILT_PATCHES": patches_dir},
-            success_exit_codes=(0, 2))
-    if os.path.exists(patches_dir):
-        shutil.rmtree(patches_dir)
-    f = open(os.path.join(path, "debian", "source", "format"), 'w')
-    try:
-        f.write("3.0 (native)\n")
-    finally:
-        f.close()
-
-
-def force_native_format(working_tree_path, current_format):
-    """Make sure a package is a format that supports native packages.
-
-    :param working_tree_path: Path to the package
-    """
-    if current_format == "3.0 (quilt)":
-        convert_3_0_quilt_to_native(working_tree_path)
-    elif current_format not in ("1.0", "3.0 (native)"):
-        raise errors.BzrCommandError("Unknown source format %s" %
-                                     current_format)
-
-
-def sign_source_package(basedir, key_id):
-    command = ["/usr/bin/debsign", "-S", "-k%s" % key_id]
-    _run_command(command, basedir,
-        "Signing the source package",
-        "Signing the package failed",
-        not_installed_msg="debsign is not installed, please install "
-            "the devscripts package.")
-
-
-def dput_source_package(basedir, target):
-    command = ["/usr/bin/debrelease", "-S", "--dput", target]
-    _run_command(command, basedir,
-        "Uploading the source package",
-        "Uploading the package failed",
-        not_installed_msg="debrelease is not installed, please "
-            "install the devscripts package.")
-
-
 launchpad_recipe_re = lazy_regex.lazy_compile(
     r'^https://code.launchpad.net/~(.*)/\+recipe/(.*)$')
 
@@ -486,72 +230,6 @@
             possible_transports)
 
 
-def debian_source_package_name(control_path):
-    """Open a debian control file and extract the package name.
-
-    """
-    f = open(control_path, 'r')
-    try:
-        control = deb822.Deb822(f)
-        # Debian policy states package names are [a-z0-9][a-z0-9.+-]+ so ascii
-        return control["Source"].encode("ascii")
-    finally:
-        f.close()
-
-
-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.
 
@@ -600,6 +278,31 @@
             if_changed_from=None, package=None, distribution=None,
             dput=None, key_id=None, no_build=None, watch_ppa=False,
             append_version=None, safe=False, allow_fallback_to_native=False):
+        try:
+            try:
+                import debian
+            except ImportError:
+                # In older versions of python-debian the main package was named 
+                # debian_bundle
+                import debian_bundle
+        except ImportError:
+            raise errors.BzrCommandError("The 'debian' python module "
+                "is required for 'bzr dailydeb'. Install the "
+                "python-debian package.")
+
+        from bzrlib.plugins.builder.deb_util import (
+            add_autobuild_changelog_entry,
+            build_source_package,
+            calculate_package_dir,
+            changelog,
+            debian_source_package_name,
+            dput_source_package,
+            extract_upstream_tarball,
+            force_native_format,
+            get_source_format,
+            sign_source_package,
+            target_from_dput,
+            )
 
         if dput is not None and key_id is None:
             raise errors.BzrCommandError("You must specify --key-id if you "
@@ -655,7 +358,7 @@
             if autobuild:
                 # Add changelog also substitutes {debupstream}.
                 add_autobuild_changelog_entry(base_branch, working_directory,
-                    package, distribution=distribution, 
+                    package, distribution=distribution,
                     append_version=append_version)
             else:
                 if append_version:
@@ -718,20 +421,3 @@
             recipe_name = recipe_name[:-len(".recipe")]
         return package or recipe_name
 
-
-def target_from_dput(dput):
-    """Convert a dput specification to a LP API specification.
-
-    :param dput: A dput command spec like ppa:team-name.
-    :return: A LP API target like team-name/ppa.
-    """
-    ppa_prefix = 'ppa:'
-    if not dput.startswith(ppa_prefix):
-        raise errors.BzrCommandError('%r does not appear to be a PPA. '
-            'A dput target like \'%suser[/name]\' must be used.'
-            % (dput, ppa_prefix))
-    base, _, suffix = dput[len(ppa_prefix):].partition('/')
-    if not suffix:
-        suffix = 'ppa'
-    return base, suffix
-

=== added file 'deb_util.py'
--- deb_util.py	1970-01-01 00:00:00 +0000
+++ deb_util.py	2011-12-15 16:22:26 +0000
@@ -0,0 +1,370 @@
+# bzr-builder: a bzr plugin to constuct trees based on recipes
+# Copyright 2009-2011 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
+# by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+# PURPOSE.  See the GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License along 
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Debian-specific utility functions."""
+
+from base64 import standard_b64decode
+from email import utils
+import errno
+import os
+import shutil
+import signal
+import subprocess
+
+from bzrlib import (
+    errors,
+    export as _mod_export,
+    osutils,
+    trace,
+    )
+
+from bzrlib.plugins.builder.recipe import (
+    SubstitutionUnavailable,
+    )
+
+try:
+    from debian import changelog, deb822
+except ImportError:
+    # In older versions of python-debian the main package was named 
+    # debian_bundle
+    from debian_bundle import changelog, deb822
+
+
+try:
+    get_maintainer = changelog.get_maintainer
+except AttributeError:
+    # Implementation of get_maintainer was added after 0.1.18 so import same
+    # function from backports module if python-debian doesn't have it.
+    from bzrlib.plugins.builder.backports import get_maintainer
+
+# The default distribution used by add_autobuild_changelog_entry()
+DEFAULT_UBUNTU_DISTRIBUTION = "lucid"
+
+
+class MissingDependency(errors.BzrError):
+    pass
+
+
+def target_from_dput(dput):
+    """Convert a dput specification to a LP API specification.
+
+    :param dput: A dput command spec like ppa:team-name.
+    :return: A LP API target like team-name/ppa.
+    """
+    ppa_prefix = 'ppa:'
+    if not dput.startswith(ppa_prefix):
+        raise errors.BzrCommandError('%r does not appear to be a PPA. '
+            'A dput target like \'%suser[/name]\' must be used.'
+            % (dput, ppa_prefix))
+    base, _, suffix = dput[len(ppa_prefix):].partition('/')
+    if not suffix:
+        suffix = 'ppa'
+    return base, suffix
+
+
+def debian_source_package_name(control_path):
+    """Open a debian control file and extract the package name.
+
+    """
+    f = open(control_path, 'r')
+    try:
+        control = deb822.Deb822(f)
+        # Debian policy states package names are [a-z0-9][a-z0-9.+-]+ so ascii
+        return control["Source"].encode("ascii")
+    finally:
+        f.close()
+
+
+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)
+
+
+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 author_name: Name of the build requester
+    :param author_email: Email of the build requester
+    :param append_version: Optional version suffix to add
+    """
+    debian_dir = os.path.join(basedir, "debian")
+    if not os.path.exists(debian_dir):
+        os.makedirs(debian_dir)
+    cl_path = os.path.join(debian_dir, "changelog")
+    file_found = False
+    if os.path.exists(cl_path):
+        file_found = True
+        cl_f = open(cl_path)
+        try:
+            contents = cl_f.read()
+        finally:
+            cl_f.close()
+        cl = changelog.Changelog(file=contents)
+    else:
+        cl = changelog.Changelog()
+    if len(cl._blocks) > 0:
+        if distribution is None:
+            distribution = cl._blocks[0].distributions.split()[0]
+    else:
+        if file_found:
+            if len(contents.strip()) > 0:
+                reason = ("debian/changelog didn't contain any "
+                         "parseable stanzas")
+            else:
+                reason = "debian/changelog was empty"
+        else:
+            reason = "debian/changelog was not present"
+        if distribution is None:
+            distribution = DEFAULT_UBUNTU_DISTRIBUTION
+    if base_branch.format in (0.1, 0.2, 0.3):
+        try:
+            base_branch.substitute_changelog_vars(None, cl)
+        except SubstitutionUnavailable, e:
+            raise errors.BzrCommandError("No previous changelog to "
+                    "take the upstream version from as %s was "
+                    "used: %s: %s." % (e.name, e.reason, reason))
+    # Use debian packaging environment variables
+    # or default values if they don't exist
+    if author_name is None or author_email is None:
+        author_name, author_email = get_maintainer()
+        # The python-debian package breaks compatibility at version 0.1.20 by
+        # switching to expecting (but not checking for) unicode rather than
+        # bytestring inputs. Detect this and decode environment if needed.
+        if getattr(changelog.Changelog, "__unicode__", None) is not None:
+            enc = osutils.get_user_encoding()
+            author_name = author_name.decode(enc)
+            author_email = author_email.decode(enc)
+    author = "%s <%s>" % (author_name, author_email)
+
+    date = utils.formatdate(localtime=True)
+    version = base_branch.deb_version
+    if append_version is not None:
+        version += append_version
+    try:
+        changelog.Version(version)
+    except (changelog.VersionError, ValueError), e:
+        raise errors.BzrCommandError("Invalid deb-version: %s: %s"
+                % (version, e))
+    cl.new_block(package=package, version=version,
+            distributions=distribution, urgency="low",
+            changes=['', '  * Auto build.', ''],
+            author=author, date=date)
+    cl_f = open(cl_path, 'wb')
+    try:
+        cl.write_to_open_file(cl_f)
+    finally:
+        cl_f.close()
+
+
+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
+    """
+    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, indata=None):
+    """ Run a command in a subprocess.
+
+    :param command: list with command and parameters
+    :param msg: message to display to the user
+    :param error_msg: message to display if something fails.
+    :param not_installed_msg: the message to display if the command
+        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()
+    if quiet:
+        kwargs = {"stderr": subprocess.STDOUT, "stdout": subprocess.PIPE}
+    else:
+        kwargs = {}
+    if env is not None:
+        kwargs["env"] = env
+    trace.mutter("running: %r", command)
+    try:
+        proc = subprocess.Popen(command, cwd=basedir,
+                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(indata)
+    if success_exit_codes is None:
+        success_exit_codes = [0]
+    if proc.returncode not in success_exit_codes:
+        if quiet:
+            raise errors.BzrCommandError("%s: %s" % (error_msg, output))
+        else:
+            raise errors.BzrCommandError(error_msg)
+
+
+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",
+        not_installed_msg="debuild is not installed, please install "
+            "the devscripts package.")
+
+
+def get_source_format(path):
+    """Retrieve the source format name from a package.
+
+    :param path: Path to the package
+    :return: String with package format
+    """
+    source_format_path = os.path.join(path, "debian", "source", "format")
+    if not os.path.exists(source_format_path):
+        return "1.0"
+    f = open(source_format_path, 'r')
+    try:
+        return f.read().strip()
+    finally:
+        f.close()
+
+
+def convert_3_0_quilt_to_native(path):
+    """Convert a package in 3.0 (quilt) format to 3.0 (native).
+
+    This applies all patches in the package and updates the 
+    debian/source/format file.
+
+    :param path: Path to the package on disk
+    """
+    path = os.path.abspath(path)
+    patches_dir = os.path.join(path, "debian", "patches")
+    series_file = os.path.join(patches_dir, "series")
+    if os.path.exists(series_file):
+        _run_command(["quilt", "push", "-a", "-v"], path,
+            "Applying quilt patches",
+            "Failed to apply quilt patches",
+            not_installed_msg="quilt is not installed, please install it.",
+            env={"QUILT_SERIES": series_file, "QUILT_PATCHES": patches_dir},
+            success_exit_codes=(0, 2))
+    if os.path.exists(patches_dir):
+        shutil.rmtree(patches_dir)
+    f = open(os.path.join(path, "debian", "source", "format"), 'w')
+    try:
+        f.write("3.0 (native)\n")
+    finally:
+        f.close()
+
+
+def force_native_format(working_tree_path, current_format):
+    """Make sure a package is a format that supports native packages.
+
+    :param working_tree_path: Path to the package
+    """
+    if current_format == "3.0 (quilt)":
+        convert_3_0_quilt_to_native(working_tree_path)
+    elif current_format not in ("1.0", "3.0 (native)"):
+        raise errors.BzrCommandError("Unknown source format %s" %
+                                     current_format)
+
+
+def sign_source_package(basedir, key_id):
+    command = ["/usr/bin/debsign", "-S", "-k%s" % key_id]
+    _run_command(command, basedir,
+        "Signing the source package",
+        "Signing the package failed",
+        not_installed_msg="debsign is not installed, please install "
+            "the devscripts package.")
+
+
+def dput_source_package(basedir, target):
+    command = ["/usr/bin/debrelease", "-S", "--dput", target]
+    _run_command(command, basedir,
+        "Uploading the source package",
+        "Uploading the package failed",
+        not_installed_msg="debrelease is not installed, please "
+            "install the devscripts package.")
+
+
+

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2011-08-14 18:08:51 +0000
+++ tests/__init__.py	2011-12-15 16:22:26 +0000
@@ -45,7 +45,7 @@
     suite = TestSuite()
     testmod_names = [
             'blackbox',
-            'ppa',
+            'deb_util',
             'recipe',
             ]
     suite.addTest(loader.loadTestsFromModuleNames(["%s.test_%s" % (__name__, i)

=== renamed file 'tests/test_ppa.py' => 'tests/test_deb_util.py'
--- tests/test_ppa.py	2011-05-05 12:33:08 +0000
+++ tests/test_deb_util.py	2011-12-15 16:22:26 +0000
@@ -13,7 +13,7 @@
 # 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 bzrlib.plugins.builder.cmds import target_from_dput
+from bzrlib.plugins.builder.deb_util import target_from_dput
 from bzrlib.tests import (
         TestCase,
         )