Merge lp:~kvalo/bzr-builder/bug-744087 into lp:bzr-builder

[Kalle Valo]

Fixed few issues I found while testing --watch-ppa in natty.

[James Westby (james-w)]

Merged, thanks Kalle.

James

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-03-01 18:06:06 +0000
+++ cmds.py	2011-03-28 10:38:26 +0000
@@ -539,8 +539,8 @@
                 shutil.rmtree(temp_dir)
         if watch_ppa:
             from bzrlib.plugins.builder.ppa import watch
-            target = target_from_dput(dput)
-            if not watch(target, self.package, base_branch.deb_version):
+            (owner, archive) = target_from_dput(dput)
+            if not watch(owner, archive, package_name, base_branch.deb_version):
                 return 2
 
     def _calculate_package_name(self, recipe_file, package):
@@ -565,5 +565,5 @@
     base, _, suffix = dput[len(ppa_prefix):].partition('/')
     if not suffix:
         suffix = 'ppa'
-    return base + '/' + suffix
+    return base, suffix
 

=== modified file 'ppa.py'
--- ppa.py	2010-07-06 20:19:05 +0000
+++ ppa.py	2011-03-28 10:38:26 +0000
@@ -31,24 +31,8 @@
 
 
 def get_lp():
-    credentials = Credentials()
     oauth_file = os.path.expanduser('~/.cache/launchpadlib/bzr-builder')
-    if os.path.exists(oauth_file):
-        f = open(oauth_file)
-        try:
-            credentials.load(f)
-        finally:
-            f.close()
-        launchpad = Launchpad(credentials, EDGE_SERVICE_ROOT)
-    else:
-        launchpad = Launchpad.get_token_and_login('bzr-builder',
-                EDGE_SERVICE_ROOT)
-        f = open(oauth_file, 'wb')
-        try:
-            launchpad.credentials.save(f)
-        finally:
-            f.close()
-    return launchpad
+    return Launchpad.login_with('bzr-builder', 'production', credentials_file=oauth_file)
 
 
 def watch(owner_name, archive_name, package_name, version):