gbp import-orig fails to import an upstream tarball when the compression changes

[Nish Aravamudan]

In essence, src:acl 2.2.51-1 used acl_2.2.51.orig.tar.gz while src:acl 2.2.51-2 used acl_2.2.51.orig.tar.bz2. Since they end up the same upstream version, `gbp import-orig` is unable to tag it and fails out. While in this case, the tarballs contain identical contents, that is not strictly required and we should be able to reproduce every tarball provided by the archive.

With some debugging:

04/26/2017 13:45:07 - INFO:Importing patches-unapplied 2.2.51-1 to debian/wheezy
04/26/2017 13:45:11 - DEBUG:Executing: git checkout --orphan master
04/26/2017 13:45:11 - DEBUG:Executing: git reset --hard
04/26/2017 13:45:11 - DEBUG:Executing: git clean -f -d
04/26/2017 13:45:12 - DEBUG:Executing: git checkout lpusip/importer/debian/dsc
04/26/2017 13:45:12 - DEBUG:Executing: git add /tmp/tmp6nkwbmga
04/26/2017 13:45:12 - DEBUG:Executing: git diff --exit-code HEAD
04/26/2017 13:45:12 - DEBUG:Executing: git checkout --orphan master
04/26/2017 13:45:12 - DEBUG:Executing: git reset --hard
04/26/2017 13:45:12 - DEBUG:Executing: git clean -f -d
04/26/2017 13:45:12 - DEBUG:Executing: git branch -M lpusip/importer/debian/pristine-tar pristine-tar
04/26/2017 13:45:12 - DEBUG:Executing: pristine-tar list
NACC: tarballs: acl_2.2.47.orig.tar.gz
acl_2.2.48.orig.tar.gz
acl_2.2.49.orig.tar.gz
acl_2.2.51.orig.tar.gz
NACC: tarball: acl_2.2.51.orig.tar.gz
04/26/2017 13:45:12 - DEBUG:Executing: git checkout --orphan master
04/26/2017 13:45:12 - DEBUG:Executing: git reset --hard
04/26/2017 13:45:12 - DEBUG:Executing: git clean -f -d
04/26/2017 13:45:12 - DEBUG:Executing: git branch -M pristine-tar lpusip/importer/debian/pristine-tar
04/26/2017 13:45:12 - DEBUG:Executing: dpkg-source -x --skip-patches /tmp/tmp6nkwbmga/.git/usd-cache/acl_2.2.51-1.dsc /tmp/tmpge04_s69/x
04/26/2017 13:45:13 - DEBUG:Executing: git --work-tree /tmp/tmpge04_s69/x add -f -A
04/26/2017 13:45:13 - DEBUG:Executing: git --work-tree /tmp/tmpge04_s69/x write-tree
04/26/2017 13:45:13 - DEBUG:Executing: git checkout --orphan master
04/26/2017 13:45:13 - DEBUG:Executing: git reset --hard
04/26/2017 13:45:13 - DEBUG:Executing: git clean -f -d
04/26/2017 13:45:13 - DEBUG:Imported patches-unapplied version 2.2.51-1 as tree 0e5183c4ce11c7b66064f76643bcd4bac50d9c51
04/26/2017 13:45:13 - DEBUG:Cache hit on (<usd.git_repository.USDGitRepository object at 0x7f5ad65ecc88>, '0e5183c4ce11c7b66064f76643bcd4bac50d9c51', <ChangelogField.all_versions: 5>) {} = 2.2.51-1\n\n2.2.49-5\n\n2.2.49-4\n\n..
04/26/2017 13:45:13 - DEBUG:Found changelog version 2.2.51-1 in newly imported tree
04/26/2017 13:45:13 - DEBUG:Executing: sh -c 'echo 646abaa7acc347bb06217f5bf086f6375e37e25b:debian/changelog | git cat-file --batch --follow-symlinks | sed -n '1{/^[^ ]* blob/!{p;q1}};2,$p' | dpkg-parsechangelog -l- -n1 -SVersion'
04/26/2017 13:45:13 - DEBUG:Executing: sh -c 'echo 646abaa7acc347bb06217f5bf086f6375e37e25b:debian/changelog | git cat-file --batch --follow-symlinks | sed -n '1{/^[^ ]* blob/!{p;q1}};2,$p' | dpkg-parsechangelog -l- -n1 -o1 -SVersion'
04/26/2017 13:45:13 - DEBUG:Tip version is 2.2.49-5
04/26/2017 13:45:13 - DEBUG:Publishing parent (tag) is lpusip/import/2.2.49-5
04/26/2017 13:45:13 - DEBUG:Executing: sh -c 'echo 0e5183c4ce11c7b66064f76643bcd4bac50d9c51:debian/changelog | git cat-file --batch --follow-symlinks | sed -n '1{/^[^ ]* blob/!{p;q1}};2,$p' | dpkg-parsechangelog -l- -n1 -SVersion'
04/26/2017 13:45:13 - DEBUG:Executing: sh -c 'echo 0e5183c4ce11c7b66064f76643bcd4bac50d9c51:debian/changelog | git cat-file --batch --follow-symlinks | sed -n '1{/^[^ ]* blob/!{p;q1}};2,$p' | dpkg-parsechangelog -l- -n1 -o1 -SVersion'
04/26/2017 13:45:13 - DEBUG:Changelog parent (tag) is lpusip/import/2.2.51-1
04/26/2017 13:45:14 - DEBUG:Executing: git diff-tree -p 472e5946fdba739a9d531bfd1fd768f9a3f6efa1 0e5183c4ce11c7b66064f76643bcd4bac50d9c51 -- debian/changelog
04/26/2017 13:45:14 - DEBUG:Cache hit on (<usd.git_repository.USDGitRepository object at 0x7f5ad65ecc88>, '0e5183c4ce11c7b66064f76643bcd4bac50d9c51', <ChangelogField.maintainer: 3>) {} = Luk Claes <email address hidden>..
04/26/2017 13:45:14 - DEBUG:Cache hit on (<usd.git_repository.USDGitRepository object at 0x7f5ad65ecc88>, '0e5183c4ce11c7b66064f76643bcd4bac50d9c51', <ChangelogField.date: 4>) {} = Thu, 23 Jun 2011 23:18:55 +020..
04/26/2017 13:45:14 - DEBUG:Executing: git commit-tree 0e5183c4ce11c7b66064f76643bcd4bac50d9c51 -p 646abaa7acc347bb06217f5bf086f6375e37e25b -p 472e5946fdba739a9d531bfd1fd768f9a3f6efa1 -F /tmp/tmpqf1fr163
04/26/2017 13:45:14 - DEBUG:Committed patches-unapplied import of 2.2.51-1 as 7f13cdc3f5049eb23ecfa75f110d941c84afdbf9 in debian/wheezy
04/26/2017 13:45:17 - INFO:Importing patches-unapplied 2.2.51-2 to debian/sid
04/26/2017 13:45:25 - DEBUG:Executing: git checkout --orphan master
04/26/2017 13:45:25 - DEBUG:Executing: git reset --hard
04/26/2017 13:45:25 - DEBUG:Executing: git clean -f -d
04/26/2017 13:45:26 - DEBUG:Executing: git checkout lpusip/importer/debian/dsc
04/26/2017 13:45:26 - DEBUG:Executing: git add /tmp/tmp6nkwbmga
04/26/2017 13:45:26 - DEBUG:Executing: git diff --exit-code HEAD
04/26/2017 13:45:26 - DEBUG:Executing: git commit -m "DSC file for 2.2.51-2"
04/26/2017 13:45:26 - DEBUG:Executing: git checkout --orphan master
04/26/2017 13:45:26 - DEBUG:Executing: git reset --hard
04/26/2017 13:45:26 - DEBUG:Executing: git clean -f -d
04/26/2017 13:45:27 - DEBUG:Executing: git branch -M lpusip/importer/debian/pristine-tar pristine-tar
04/26/2017 13:45:27 - DEBUG:Executing: pristine-tar list
NACC: tarballs: acl_2.2.47.orig.tar.gz
acl_2.2.48.orig.tar.gz
acl_2.2.49.orig.tar.gz
acl_2.2.51.orig.tar.gz
NACC: tarball: acl_2.2.51.orig.tar.bz2
04/26/2017 13:45:27 - DEBUG:Verifying orig tarball /tmp/tmp6nkwbmga/.git/usd-cache/acl_2.2.51.orig.tar.bz2
04/26/2017 13:45:27 - DEBUG:Executing: git checkout do-not-push
04/26/2017 13:45:27 - DEBUG:Executing: gbp import-orig --no-merge --upstream-branch do-not-push --pristine-tar --no-interactive --no-symlink-orig '--upstream-tag=lpusip/upstream/debian/%(version)s' /tmp/tmp6nkwbmga/.git/usd-cache/acl_2.2.51.orig.tar.bz2
04/26/2017 13:45:28 - ERROR:Command exited 1: gbp import-orig --no-merge --upstream-branch do-not-push --pristine-tar --no-interactive --no-symlink-orig '--upstream-tag=lpusip/upstream/debian/%(version)s' /tmp/tmp6nkwbmga/.git/usd-cache/acl_2.2.51.orig.tar.bz2
04/26/2017 13:45:28 - ERROR:stdout:
04/26/2017 13:45:28 - ERROR:stderr: gbp:error: Upstream tag 'lpusip/upstream/debian/2.2.51' already exists
04/26/2017 13:45:28 - DEBUG:Executing: git checkout --orphan master
04/26/2017 13:45:28 - DEBUG:Executing: git reset --hard
04/26/2017 13:45:28 - DEBUG:Executing: git clean -f -d
04/26/2017 13:45:28 - DEBUG:Executing: git branch -M pristine-tar lpusip/importer/debian/pristine-tar
04/26/2017 13:45:28 - ERROR:Unable to import orig tarball for 2.2.51-2
04/26/2017 13:45:28 - DEBUG:Executing: dpkg-source -x --skip-patches /tmp/tmp6nkwbmga/.git/usd-cache/acl_2.2.51-2.dsc /tmp/tmpvjlwmwlw/x
04/26/2017 13:45:28 - DEBUG:Executing: git --work-tree /tmp/tmpvjlwmwlw/x add -f -A
04/26/2017 13:45:28 - DEBUG:Executing: git --work-tree /tmp/tmpvjlwmwlw/x write-tree
04/26/2017 13:45:28 - DEBUG:Executing: git checkout --orphan master
04/26/2017 13:45:28 - DEBUG:Executing: git reset --hard
04/26/2017 13:45:28 - DEBUG:Executing: git clean -f -d
04/26/2017 13:45:28 - DEBUG:Imported patches-unapplied version 2.2.51-2 as tree 0d9c73565e8ba6076e4f3e455936eb3c8584a82b
04/26/2017 13:45:28 - DEBUG:Executing: sh -c 'echo 0d9c73565e8ba6076e4f3e455936eb3c8584a82b:debian/changelog | git cat-file --batch --follow-symlinks | sed -n '1{/^[^ ]* blob/!{p;q1}};2,$p' | dpkg-parsechangelog -l- --format rfc822 -SVersion --all'
04/26/2017 13:45:28 - DEBUG:Found changelog version 2.2.51-2 in newly imported tree
04/26/2017 13:45:28 - DEBUG:Executing: sh -c 'echo 472e5946fdba739a9d531bfd1fd768f9a3f6efa1:debian/changelog | git cat-file --batch --follow-symlinks | sed -n '1{/^[^ ]* blob/!{p;q1}};2,$p' | dpkg-parsechangelog -l- -n1 -SVersion'
04/26/2017 13:45:29 - DEBUG:Executing: sh -c 'echo 472e5946fdba739a9d531bfd1fd768f9a3f6efa1:debian/changelog | git cat-file --batch --follow-symlinks | sed -n '1{/^[^ ]* blob/!{p;q1}};2,$p' | dpkg-parsechangelog -l- -n1 -o1 -SVersion'
04/26/2017 13:45:29 - DEBUG:Tip version is 2.2.51-1
04/26/2017 13:45:29 - DEBUG:Publishing parent (tag) is lpusip/import/2.2.51-1
04/26/2017 13:45:29 - DEBUG:Cache hit on (<usd.git_repository.USDGitRepository object at 0x7f5ad65ecc88>, '0e5183c4ce11c7b66064f76643bcd4bac50d9c51', <ChangelogField.version: 1>) {} = 2.2.51-1..
04/26/2017 13:45:29 - DEBUG:Cache hit on (<usd.git_repository.USDGitRepository object at 0x7f5ad65ecc88>, '0e5183c4ce11c7b66064f76643bcd4bac50d9c51', <ChangelogField.previous_version: 2>) {} = 2.2.49-5..
04/26/2017 13:45:29 - DEBUG:Changelog parent (tag) is lpusip/import/2.2.51-1
04/26/2017 13:45:30 - DEBUG:Executing: git diff-tree -p 472e5946fdba739a9d531bfd1fd768f9a3f6efa1 0d9c73565e8ba6076e4f3e455936eb3c8584a82b -- debian/changelog
04/26/2017 13:45:30 - DEBUG:Executing: sh -c 'echo 0d9c73565e8ba6076e4f3e455936eb3c8584a82b:debian/changelog | git cat-file --batch --follow-symlinks | sed -n '1{/^[^ ]* blob/!{p;q1}};2,$p' | dpkg-parsechangelog -l- -SMaintainer'
04/26/2017 13:45:30 - DEBUG:Executing: sh -c 'echo 0d9c73565e8ba6076e4f3e455936eb3c8584a82b:debian/changelog | git cat-file --batch --follow-symlinks | sed -n '1{/^[^ ]* blob/!{p;q1}};2,$p' | dpkg-parsechangelog -l- -SDate'
04/26/2017 13:45:30 - DEBUG:Executing: git commit-tree 0d9c73565e8ba6076e4f3e455936eb3c8584a82b -p 472e5946fdba739a9d531bfd1fd768f9a3f6efa1 -F /tmp/tmph2qe65bb
04/26/2017 13:45:30 - DEBUG:Committed patches-unapplied import of 2.2.51-2 as 4c8685305a47d36c14ebb739cb4e25c76fe748ac in debian/sid
04/26/2017 13:45:30 - DEBUG:Creating tag lpusip/import/2.2.51-2 pointing to 4c8685305a47d36c14ebb739cb4e25c76fe748ac
04/26/2017 13:45:30 - DEBUG:Executing: git tag -a -m "usd import v1.0-rc5" lpusip/import/2.2.51-2 4c8685305a47d36c14ebb739cb4e25c76fe748ac
04/26/2017 13:45:34 - INFO:Importing patches-unapplied 2.2.51-2 to debian/wheezy
04/26/2017 13:45:37 - DEBUG:Executing: git checkout --orphan master
04/26/2017 13:45:37 - DEBUG:Executing: git reset --hard
04/26/2017 13:45:37 - DEBUG:Executing: git clean -f -d
04/26/2017 13:45:39 - DEBUG:Executing: git checkout lpusip/importer/debian/dsc
04/26/2017 13:45:39 - DEBUG:Executing: git add /tmp/tmp6nkwbmga
04/26/2017 13:45:39 - DEBUG:Executing: git diff --exit-code HEAD
04/26/2017 13:45:39 - DEBUG:Executing: git checkout --orphan master
04/26/2017 13:45:39 - DEBUG:Executing: git reset --hard
04/26/2017 13:45:39 - DEBUG:Executing: git clean -f -d
04/26/2017 13:45:39 - DEBUG:Executing: git branch -M lpusip/importer/debian/pristine-tar pristine-tar
04/26/2017 13:45:39 - DEBUG:Executing: pristine-tar list
NACC: tarballs: acl_2.2.47.orig.tar.gz
acl_2.2.48.orig.tar.gz
acl_2.2.49.orig.tar.gz
acl_2.2.51.orig.tar.gz
NACC: tarball: acl_2.2.51.orig.tar.bz2
04/26/2017 13:45:40 - DEBUG:Verifying orig tarball /tmp/tmp6nkwbmga/.git/usd-cache/acl_2.2.51.orig.tar.bz2
04/26/2017 13:45:40 - DEBUG:Executing: git checkout do-not-push
04/26/2017 13:45:40 - DEBUG:Executing: gbp import-orig --no-merge --upstream-branch do-not-push --pristine-tar --no-interactive --no-symlink-orig '--upstream-tag=lpusip/upstream/debian/%(version)s' /tmp/tmp6nkwbmga/.git/usd-cache/acl_2.2.51.orig.tar.bz2
04/26/2017 13:45:40 - ERROR:Command exited 1: gbp import-orig --no-merge --upstream-branch do-not-push --pristine-tar --no-interactive --no-symlink-orig '--upstream-tag=lpusip/upstream/debian/%(version)s' /tmp/tmp6nkwbmga/.git/usd-cache/acl_2.2.51.orig.tar.bz2
04/26/2017 13:45:40 - ERROR:stdout:
04/26/2017 13:45:40 - ERROR:stderr: gbp:error: Upstream tag 'lpusip/upstream/debian/2.2.51' already exists