Merge lp:~jelmer/bzr-builddeb/integration into lp:bzr-builddeb

[Jelmer Vernooij]

Branch with two unrelated trivial changes:

* Move changelog addition function out of cmds.py
* Fix the fix for bug 572093 - getattr() with two arguments raises an AttributeError if the attribute was not found.

=== modified file 'cmds.py'
--- cmds.py	2010-03-04 16:34:03 +0000
+++ cmds.py	2010-03-22 21:18:27 +0000
@@ -471,29 +471,13 @@
             distribution_opt, directory_opt, last_version_opt,
             force_opt, v3_opt, 'revision', 'merge-type']
 
-    def _update_changelog(self, tree, version, distribution_name, changelog,
-            package):
-        from bzrlib.plugins.builddeb.merge_upstream import package_version
-        if "~bzr" in str(version) or "+bzr" in str(version):
-            entry_description = "New upstream snapshot."
-        else:
-            entry_description = "New upstream release."
-        proc = subprocess.Popen(["dch", "-v",
-                str(package_version(version, distribution_name)),
-                "-D", "UNRELEASED", "--release-heuristic", "changelog",
-                entry_description], cwd=tree.basedir)
-        proc.wait()
-        if proc.returncode != 0:
-            raise BzrCommandError('Adding a new changelog stanza after the '
-                    'merge had completed failed. Add the new changelog entry '
-                    'yourself, review the merge, and then commit.')
-
     def run(self, location=None, upstream_branch=None, version=None, distribution=None,
             package=None, no_user_config=None, directory=".", revision=None,
             merge_type=None, last_version=None, force=None, v3=None):
         from bzrlib.plugins.builddeb.errors import MissingChangelogError
         from bzrlib.plugins.builddeb.repack_tarball import repack_tarball
-        from bzrlib.plugins.builddeb.merge_upstream import upstream_branch_version
+        from bzrlib.plugins.builddeb.merge_upstream import (changelog_add_new_version,
+            upstream_branch_version)
         tree, _ = WorkingTree.open_containing(directory)
         tree.lock_write()
         try:
@@ -619,8 +603,11 @@
                     upstream_revision=upstream_revision,
                     merge_type=merge_type, force=force)
 
-            self._update_changelog(tree, version, distribution_name, changelog,
-                    package)
+            if not changelog_add_new_version(tree, version, distribution_name,
+                    changelog, package):
+                raise BzrCommandError('Adding a new changelog stanza after the '
+                        'merge had completed failed. Add the new changelog '
+                        'entry yourself, review the merge, and then commit.')
         finally:
             tree.unlock()
         note("The new upstream version has been imported.")
 
=== modified file 'merge_upstream.py'
--- merge_upstream.py	2009-03-10 01:57:05 +0000
+++ merge_upstream.py	2010-03-22 21:18:27 +0000
@@ -27,6 +27,7 @@
 #
 
 import itertools
+import subprocess
 
 from debian_bundle.changelog import Version
 
@@ -163,3 +164,30 @@
     else:
         ret.debian_version = "%d" % (prev_packaging_revnum+1)
     return ret
+
+
+def changelog_add_new_version(tree, version, distribution_name, changelog,
+        package):
+    """Add an entry to the changelog for a new version.
+
+    :param tree: WorkingTree in which the package lives
+    :param version: Version to add
+    :param distribution_name: Distribution name (debian, ubuntu, ...)
+    :param changelog: Changelog object
+    :param package: Package name
+    :return: Whether an entry was successfully added
+    """
+    from bzrlib.plugins.builddeb.merge_upstream import package_version
+    if "~bzr" in str(version) or "+bzr" in str(version):
+        entry_description = "New upstream snapshot."
+    else:
+        entry_description = "New upstream release."
+    proc = subprocess.Popen(["dch", "-v",
+            str(package_version(version, distribution_name)),
+            "-D", "UNRELEASED", "--release-heuristic", "changelog",
+            entry_description], cwd=tree.basedir)
+    proc.wait()
+    # FIXME: Raise insightful exception here rather than just checking
+    # return code.
+    return proc.returncode == 0
+
 
=== modified file 'upstream.py'
--- upstream.py	2010-03-11 23:44:57 +0000
+++ upstream.py	2010-03-22 21:18:27 +0000
@@ -110,7 +110,7 @@
         # URIs (LP:375897)
         try:
             get_sources = getattr(apt_pkg, 'SourceRecords',
-                    getattr(apt_pkg, 'GetPkgSrcRecords'))
+                    getattr(apt_pkg, 'GetPkgSrcRecords', None))
             sources = get_sources()
         except SystemError:
             raise PackageVersionNotPresent(package, upstream_version, self)