Merge lp:~jelmer/bzr-builddeb/fix-restart into lp:bzr-builddeb

[Jelmer Vernooij]

This fixes three places where we were calling getattr() to deal with renames in apt_pkg but specified only two arguments.

[Robert Collins (lifeless)]

 review: needsfixing

This will change a failure from an attribute error to a 'None is not
callable' error - hardly an improvement.

Either also guard the result against being None, or just leave it alone
- it looks fine to me.

-Rob

review: Needs Fixing

[Robert Collins (lifeless)]

 review: +1

Oh, argh, I see the issue - perhaps. Is the case you're dealing with
that the second getattr is looked up before the first, as its passed
into the first/outer one, so the compatability code only works one way
at the moment?

-Rob

review: Approve

[Jelmer Vernooij (jelmer)]

On Sun, 2010-04-11 at 22:18 +0000, Robert Collins wrote:
> Review: Approve
> review: +1
>
> Oh, argh, I see the issue - perhaps. Is the case you're dealing with
> that the second getattr is looked up before the first, as its passed
> into the first/outer one, so the compatability code only works one way
> at the moment?
Yep, that's indeed what I intended to fix. The author probably had the
function in the second getattr present so never saw the AttributeError,
as the first getattr has three arguments and never raises
AttributeError.

Cheers,

Jelmer

=== modified file 'upstream.py'
--- upstream.py	2010-03-30 18:36:31 +0000
+++ upstream.py	2010-04-11 21:02:14 +0000
@@ -115,12 +115,12 @@
         except SystemError:
             raise PackageVersionNotPresent(package, upstream_version, self)
 
-        restart = getattr(sources, 'restart', getattr(sources, 'Restart'))
+        restart = getattr(sources, 'restart', getattr(sources, 'Restart', None))
         restart()
         note("Using apt to look for the upstream tarball.")
-        lookup = getattr(sources, 'lookup', getattr(sources, 'Lookup'))
+        lookup = getattr(sources, 'lookup', getattr(sources, 'Lookup', None))
         while lookup(package):
-            version = getattr(sources, 'version', getattr(sources, 'Version'))
+            version = getattr(sources, 'version', getattr(sources, 'Version', None))
             if upstream_version == Version(version).upstream_version:
                 if self._run_apt_source(package, version, target_dir):
                     return