Package: git-buildpackage
Version: 0.6.15
Severity: important

My ~/.gbp.conf file says this:
[DEFAULT]
upstream-tag = extern/%(version)s
debian-tag = DEBIAN/%(version)s
upstream-branch = master
debian-branch = debian

This does not work. The root cause is the "upstream-branch" setting.


$ git-import-dscs --debsnap python-tempita
gbp:info: Downloading snapshots of 'python-tempita' to '/tmp/tmp7lB_o3'...
gbp:info: No git repository found, creating one.
gbp:info: Tag extern/0.1 not found, importing Upstream tarball
gbp:error: Git command failed: Error running git branch: fatal: A branch named 
'master' already exists.

gbp:error: Failed to import '/tmp/tmp7lB_o3/python-tempita_0.1-1.dsc'


Adding --verbose changes the error.
(Still doesn't work.)

$ git-import-dscs --debsnap --verbose python-tempita
gbp:info: Downloading snapshots of 'python-tempita' to '/tmp/tmpT34_75'...
gbp:debug: debsnap ['--force', '--destdir=/tmp/tmpT34_75', 'python-tempita'] []
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.5.1-1', 'lt', '0.4-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.5.1-1', 'gt', '0.4-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.2-1', 'lt', '0.5.1-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.2-1', 'lt', '0.5.1-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.2-1', 'lt', '0.4-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.1-2', 'lt', '0.4-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.1-2', 'lt', '0.2-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.5.2-1', 'lt', '0.4-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.5.2-1', 'gt', '0.4-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.5.2-1', 'lt', '0.5.1-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.5.2-1', 'gt', '0.5.1-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.4-1~bpo50+2', 'lt', '0.4-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.4-1~bpo50+2', 'lt', '0.2-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.4-1~bpo50+2', 'gt', '0.2-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.1-1', 'lt', '0.4-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.1-1', 'lt', '0.2-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.1-1', 'lt', '0.1-2']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.3-1', 'lt', '0.4-1~bpo50+2']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.3-1', 'lt', '0.1-2']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.3-1', 'gt', '0.1-2']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.3-1', 'lt', '0.2-1']
gbp:debug: /usr/bin/dpkg ['--compare-versions'] ['0.3-1', 'gt', '0.2-1']
gbp:debug: ['git', 'rev-parse', '--show-cdup']
gbp:debug: Upstream version: 0.1
gbp:debug: Debian version: 1
gbp:debug: Upstream tarball: /tmp/tmpT34_75/python-tempita_0.1.orig.tar.gz
gbp:debug: Debian patch: /tmp/tmpT34_75/python-tempita_0.1-1.diff.gz
gbp:debug: ['git', 'rev-parse', '--show-cdup']
gbp:info: No git repository found, creating one.
gbp:debug: ['git', 'init']
gbp:debug: ['git', 'rev-parse', '--show-cdup']
gbp:debug: ['git', 'rev-parse', '--is-bare-repository']
gbp:debug: tar ['-C', '/tmp/tmpY2lXzn', '-a', '-xf', 
'/tmp/tmpT34_75/python-tempita_0.1.orig.tar.gz'] []
gbp:debug: ['git', 'tag', '-l', 'DEBIAN/0.1-1']
gbp:debug: ['git', 'tag', '-l', 'DEBIAN/0.1-1']
gbp:debug: ['git', 'tag', '-l', 'extern/0.1']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'extern/0.1^0']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'extern/0.1^{commit}']
gbp:debug: ['git', 'branch', '--contains', 
'ec85326d2bd074f5ce291e46a8c7560c0961ee7e']
gbp:debug: Tag 'extern/0.1' not yet merged into 'debian'
gbp:debug: ['git', 'add', '-f', '.']
gbp:debug: ['git', 'write-tree']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'debian']
gbp:error: Failed to import Debian package: revision 'debian' not found
gbp:debug: rm ['-rf', '/tmp/tmpY2lXzn'] []
gbp:error: Failed to import '/tmp/tmpT34_75/python-tempita_0.1-1.dsc'
gbp:debug: rm ['-rf', '/tmp/tmpT34_75'] []
$

-- System Information:
Debian Release: 7.5
  APT prefers stable
  APT policy: (700, 'stable'), (650, 'testing'), (600, 'unstable'), (550, 
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.12-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages git-buildpackage depends on:
ii  devscripts            2.14.4
ii  git                   1:2.0.0~rc2-1
ii  man-db                2.6.7.1-1
ii  python                2.7.6-2
ii  python-dateutil       1.5+dfsg-0.1
ii  python-pkg-resources  3.6-1

Versions of packages git-buildpackage recommends:
ii  cowbuilder    0.70
ii  pristine-tar  1.25+deb7u1

Versions of packages git-buildpackage suggests:
pn  python-notify  <none>
ii  unzip          6.0-12

-- no debconf information


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to