Bug#820494: origtargz: leaves "upstream" files in "master" after invocation

Christoph Berg myon at debian.org
Sat Apr 9 09:49:11 UTC 2016


Re: Dmitry Smirnov 2016-04-09 <2265949.YxrWVc7PcZ at deblab>
> > Though both origtargz and mk-origtargz don't do anything directly with
> > git and branches, so I'm wondering where you got that connection from?
> 
> From "origtargz" functionality of course. One can checkout package repository 
> with upstream and pristine-tar branches and generate orig tarball using 
> "origtargz" even if package is not uploaded yet in which case tarball is 
> generated straight from repository.
> origtargz(1) man page says "The main use for origtargz is with debian-dir-
> only repository checkouts" which IMHO is precisely what does not work as 
> expected.
> 
> I did not have much time to investigate root cause of the problem. Perhaps 
> you know better what exactly is not working properly. It could be "pristine-
> tar" or something else... Please feel free to reassign.
> 
> I think I've described symptoms precisely so it should be easy to reproduce.

Hi,

I think your idea from what the program is doing is just wrong.
There's two parts:

1) tarball downloading - that makes sure there is a
../foo_1.0.orig.tar.* file for the current version of your package.
The version number is determined from debian/changelog. There's a few
methods to download the package, apt-get source, pristine-tar, and
uscan. Neither of these are supposed to mess with the current
directory. (Possibly uscan will try to upgrade the current directory,
depending on your ~/.devscripts.)

What method was used to download the file is shown on "origtargz"
invocation

2) unpacking - if the current directory contains debian/ only, or
--unpack is passed, origtargz does the equivalent of "rm -rf
*-except-debian", and unpacks the orig tarball to the current
directory.

Neither of these steps touch anything git-related, so I don't see how
you got the connection to the "upstream" branch.

What differences exactly are you seeing after unpacking?

Christoph



More information about the devscripts-devel mailing list