From f521caa013037ebb6f8e77c7dc15c1998e77a60f Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Sat, 2 Jun 2012 20:34:20 +0100 Subject: [PATCH] backportpackage: Fix filenames searched when looking for existing .orig.tar.foo files (to determine if we need to upload it again or not). We need to look for package_upstreamversion.orig.tar.foo, not package_fullversion.orig.tar.foo. LP: #1007908 --- backportpackage | 4 +--- debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/backportpackage b/backportpackage index 5a00098..0504dc5 100755 --- a/backportpackage +++ b/backportpackage @@ -269,9 +269,7 @@ def orig_needed(upload, workdir, pkg): ppa = upload.split(':', 1)[1] user, ppa = ppa.split('/', 1) - version = pkg.version.full_version - if pkg.version.epoch: - version = version.split(pkg.version.epoch, 1)[1] + version = pkg.version.upstream_version h = Http() for filename in glob.glob(os.path.join(workdir, diff --git a/debian/changelog b/debian/changelog index fc732c0..8921141 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ubuntu-dev-tools (0.143) UNRELEASED; urgency=low + + * backportpackage: Fix filenames searched when looking for existing + .orig.tar.foo files (to determine if we need to upload it again or not). + (LP: #1007908) + + -- Iain Lane Sat, 02 Jun 2012 20:25:50 +0100 + ubuntu-dev-tools (0.142) unstable; urgency=low [ Stefano Rivera ]