From 2b5e91e32ef7c301b393a35fd854416627e0aaa3 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Fri, 12 Jul 2013 13:38:32 -0700 Subject: [PATCH] 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) --- backportpackage | 4 +++- debian/changelog | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/backportpackage b/backportpackage index 45fc0cc..f6261ec 100755 --- a/backportpackage +++ b/backportpackage @@ -291,7 +291,9 @@ def orig_needed(upload, workdir, pkg): % (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) diff --git a/debian/changelog b/debian/changelog index 93a51aa..a050939 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,12 @@ ubuntu-dev-tools (0.149) UNRELEASED; urgency=low [ Adam Gandelman ] * backportpackage: Fix destination for --dont-sign option. (LP: #1183985) - -- Adam Gandelman 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 Tue, 09 Jul 2013 17:49:21 -0700 ubuntu-dev-tools (0.148) unstable; urgency=low