Package: dpkg-dev
Version: 1.18.25
Severity: important

This seems like a potential data loss bug.
Transcript of repro follows.

I think this is related to #865426.  Note that the orig seems to be
correctly picked up from dpkg-source's cwd.

Ian.

zealot:910725> pwd
/home/ian/things/Dgit/Bugs/910725
zealot:910725> rm -rf abspath
zealot:910725> mkdir abspath
zealot:910725> cd abspath/
zealot:abspath> mkdir bpd
zealot:abspath> dgit clone --build-products-dir=../bpd mason
canonical suite name for unstable is sid
fetching existing git history
>From https://git.dgit.debian.org/mason
 * [new branch]      master     -> origin/master
downloading 
http://ftp.debian.org/debian//pool/main/m/mason/mason_1.0.0-13.dsc...
downloading 
http://ftp.debian.org/debian//pool/main/m/mason/mason_1.0.0-12.4.dsc...
last upload to archive: NO git hash
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  495k  100  495k    0     0  2812k      0 --:--:-- --:--:-- --:--:-- 2828k
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100 27602  100 27602    0     0   311k      0 --:--:-- --:--:-- --:--:--  313k
dpkg-source: info: extracting mason in mason-1.0.0
dpkg-source: info: unpacking mason_1.0.0.orig.tar.gz
dpkg-source: info: applying mason_1.0.0-12.4.diff.gz
dpkg-source: info: upstream files that have been modified: 
 mason-1.0.0/Makefile
 mason-1.0.0/baserules.sample
 mason-1.0.0/firewall
 mason-1.0.0/mason
 mason-1.0.0/mason-decide
 mason-1.0.0/mason-gui-text
 mason-1.0.0/mason-gui-text.1
 mason-1.0.0/mason.1
 mason-1.0.0/masonlib
 mason-1.0.0/masonrc
 mason-1.0.0/samlib
 mason-1.0.0/ttt
synthesised git commit from .dsc 1.0.0-12.4

Version actually in archive:   1.0.0-12.4 (older)
Last version pushed with dgit: 1.0.0-13 (newer or same)
Perhaps the upload is stuck in incoming.  Using the version from git.

HEAD is now at 0df2780 Changelog for 1.0.0-13
dgit ok: ready for work in mason
zealot:abspath> cd mason
zealot:mason> git reset --hard 45a228dbf27ec8b05b19f6b899d797b67d2d4726
HEAD is now at 45a228d mason (1.0.0-12.4) unstable; urgency=medium
zealot:mason> cd ..
zealot:abspath> mkdir mason.orig
zealot:abspath> echo hi >mason.orig/ho
zealot:abspath> cd bpd
zealot:bpd> ls
mason_1.0.0-12.4.diff.gz  mason_1.0.0.orig.tar.gz
zealot:bpd> ls ..
bpd/  mason/  mason.orig/
zealot:bpd> dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b 
~/things/Dgit/Bugs/910725/abspath/mason
dpkg-source: warning: no source format specified in debian/source/format, see 
dpkg-source(1)
dpkg-source: info: using source format '1.0'
dpkg-source: warning: source directory 
'/home/ian/things/Dgit/Bugs/910725/abspath/mason' is not 
<sourcepackage>-<upstreamversion> 'mason-1.0.0'
dpkg-source: warning: .orig directory name mason.orig is not 
<package>-<upstreamversion> (wanted mason-1.0.0.orig)
dpkg-source: info: building mason using existing mason_1.0.0.orig.tar.gz
dpkg-source: info: building mason in mason_1.0.0-12.4.diff.gz
dpkg-source: warning: the diff modifies the following upstream files: 
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/Makefile
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/baserules.sample
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/NEWS
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/README.Debian
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/changelog
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/compat
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/conffiles
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/config
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/control
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/copyright
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/POTFILES.in
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/cs.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/da.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/de.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/es.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/eu.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/fi.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/fr.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/gl.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/it.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/ja.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/nb.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/nl.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/pt.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/pt_BR.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/ru.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/sv.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/templates.pot
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/tr.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/vi.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/po/zh_CN.po
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/postinst
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/postrm
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/rules
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/templates
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/debian/watch
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/firewall
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/mason
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/mason-decide
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/mason-gui-text
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/mason-gui-text.1
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/mason.1
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/masonlib
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/masonrc
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/samlib
 /home/ian/things/Dgit/Bugs/910725/abspath/mason.orig/ttt
dpkg-source: info: use the '3.0 (quilt)' format to have separate and documented 
changes to upstream files, see dpkg-source(1)
dpkg-source: info: building mason in mason_1.0.0-12.4.dsc
zealot:bpd> ls ../mason.orig
/bin/ls: cannot access '../mason.orig': No such file or directory
zealot:bpd> 




-- 
Ian Jackson <[email protected]>   These opinions are my own.

If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.

Reply via email to