Merge lp:~broder/ubuntu-dev-tools/fix-1106429 into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

[Evan Broder]

I'm not wild about this logic, but it seemed like the best way to distinguish redirects that were OK from redirects that were not.

[Dmitry Shachnev (mitya57)]

FWIW, the trailing backslash is not needed when you are inside (...).

[lp:~broder/ubuntu-dev-tools/fix-1106429]

1392. By Evan Broder on 2013-07-12

Only conclude that we don't need an orig tarball if we're sent to the
librarian (as opposed to the login page from a private PPA). (LP:
#1106429)

[Evan Broder (broder)]

Thanks for the pointer - just pushed a tweak

[Martin Pitt (pitti)]

Thanks! Merged.

review: Approve

=== modified file 'backportpackage'
--- backportpackage	2013-05-24 19:58:12 +0000
+++ backportpackage	2013-07-12 20:41:27 +0000
@@ -291,7 +291,9 @@
                % (user, ppa, filename))
         try:
             headers, body = h.request(url, 'HEAD')
-            if headers.status != 200:
+            if (headers.status != 200 or 
+                not headers['content-location'].
+                    startswith('https://launchpadlibrarian.net')):
                 return True
         except HttpLib2Error, e:
             Logger.info(e)

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-24 19:58:12 +0000
+++ debian/changelog	2013-07-12 20:41:27 +0000
@@ -10,7 +10,12 @@
   [ Adam Gandelman ]
   * backportpackage: Fix destination for --dont-sign option. (LP: #1183985)
 
- -- Adam Gandelman <[e-mail]>  Fri, 24 May 2013 12:56:08 -0700
+  [ Evan Broder ]
+  * Only conclude that we don't need an orig tarball if we're sent to the
+    librarian (as opposed to the login page from a private PPA). (LP:
+    #1106429)
+
+ -- Evan Broder <[e-mail]>  Tue, 09 Jul 2013 17:49:21 -0700
 
 ubuntu-dev-tools (0.148) unstable; urgency=low