On Friday, April 22 2022, Drew Parsons wrote: > I'm trying to update the rclone package, using gbp import-orig in the > "usual" way, with uscan, pristine-tar and importing into the > experimental branch. > > The import is failing, apparently due to using a git commit in a > filename during the pristine-tar step. > > $ git clone g...@salsa.debian.org:go-team/packages/rclone.git > $ cd rclone > $ git checkout upstream; git checkout pristine-tar; git checkout experimental > $ git branch > * experimental > master > pristine-tar > upstream > $ uscan --report > uscan: Newest version of rclone on remote site is 1.58.0, local version is > 1.53.3 > uscan: => Newer package available from: > => https://github.com/rclone/rclone/archive/refs/tags/v1.58.0.tar.gz > > $ gbp import-orig --verbose --uscan --pristine-tar > --debian-branch=experimental > gbp:debug: ['git', 'rev-parse', '--show-cdup'] > gbp:debug: ['git', 'rev-parse', '--is-bare-repository'] > gbp:debug: ['git', 'rev-parse', '--git-dir'] > gbp:debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/'] > gbp:debug: ['git', 'show-ref', '--verify', 'refs/heads/upstream'] > gbp:debug: ['git', 'status', '--porcelain'] > gbp:info: Launching uscan... > gbp:info: Using uscan downloaded tarball ../rclone_1.58.0.orig.tar.gz > What is the upstream version? [1.58.0] > gbp:debug: ['git', 'tag', '-l', 'upstream/1.58.0'] > gbp:debug: tar ['-C', '../tmpkiz0ywn3', '-a', '-xf', > '../rclone_1.58.0.orig.tar.gz'] [] > gbp:debug: Unpacked '../rclone_1.58.0.orig.tar.gz' to > '../tmpkiz0ywn3/rclone-1.58.0' > gbp:info: <DebianUpstreamSource path='../rclone_1.58.0.orig.tar.gz' > signaturefile=None> > gbp:info: Importing '../rclone_1.58.0.orig.tar.gz' to branch 'upstream'... > gbp:info: Source package is rclone > gbp:info: Upstream version is 1.58.0 > gbp:debug: ['git', 'show-ref', '--verify', 'refs/heads/upstream'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream'] > gbp:debug: ['git', 'add', '-f', '.'] > gbp:debug: ['git', 'write-tree'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream'] > gbp:debug: ['git', 'commit-tree', '260bd813325c0b30022ab31e09fc3d9ab570e072', > '-p', '4d715ab7de2dd24d802fe89bd79048ba674a25ea'] > gbp:debug: ['git', 'update-ref', '-m', 'gbp: New upstream version 1.58.0', > 'refs/heads/upstream', '70bb7aad80b8c50a88d59be119fbdc5c0f72ad3c', > '4d715ab7de2dd24d802fe89bd79048ba674a25ea'] > gbp:debug: ['git', 'show-ref', '--verify', 'refs/heads/pristine-tar'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'pristine-tar'] > gbp:debug: ['git', 'ls-tree', '-z', 'upstream', '--'] > gbp:debug: ['git', 'mktree', '-z'] > gbp:debug: pristine-tar [] ['commit', '../rclone_1.58.0.orig.tar.gz', > '260bd813325c0b30022ab31e09fc3d9ab570e072'] > gbp:error: Import of ../rclone_1.58.0.orig.tar.gz failed: Couldn't commit to > 'pristine-tar' with upstream '260bd813325c0b30022ab31e09fc3d9ab570e072': > mkdir > /tmp/pristine-tar.iXqSpNTndf/workdir/rclone-1.58.0/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_\346\270\254\350\251\246_\320\240\321\203\321\201\321\201\320\272\320\270\320\271_____\304\233_\303\241\303\261.._testdir_path2_\346\270\254\350\251\246_\320\240\321\203\321\201\321\201\320\272\320\270\320\271_____\304\233_\303\241\303\261.copy1to2.que: > File name too long at /usr/bin/pristine-tar line 451. > gbp:error: Error detected, Will roll back changes. > gbp:info: Rolling back branch upstream by resetting it to > 4d715ab7de2dd24d802fe89bd79048ba674a25ea > gbp:debug: ['git', 'update-ref', '-m', 'gbp import-orig: failure rollback of > upstream', 'refs/heads/upstream', '4d715ab7de2dd24d802fe89bd79048ba674a25ea'] > gbp:info: Rolling back branch pristine-tar by resetting it to > f92427a73c1a897f36b08dbf40a402c144d75b73 > gbp:debug: ['git', 'update-ref', '-m', 'gbp import-orig: failure rollback of > pristine-tar', 'refs/heads/pristine-tar', > 'f92427a73c1a897f36b08dbf40a402c144d75b73'] > gbp:error: Rolled back changes after import error. > gbp:debug: rm ['-rf', '../tmpkiz0ywn3'] []
I think this should be filed against pristine-tar, not git-buildpackage, because it's the former that's complaining about the long filename. On a side note, I also believe that it's worth proceeding with rclone's update and just resort to Files-Excluded meanwhile in order to remove these tests from the orig tarball. A quick attempt with the following excerpt on d/copyright succeeded here: --8<---------------cut here---------------start------------->8--- Files-Excluded: cmd/bisync/testdata/test_extended_char_paths* --8<---------------cut here---------------end--------------->8--- Cheers, -- Sergio GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36 Please send encrypted e-mail if possible https://sergiodj.net/
