Package: git-buildpackage
Version: 0.4.4
Severity: normal
Tags: patch
Hi,
git-import-orig breaks on startup:
Traceback (most recent call last):
File "/usr/bin/git-import-orig", line 211, in ?
sys.exit(main(sys.argv))
File "/usr/bin/git-import-orig", line 140, in main
if not repo.has_branch(options.upstream_upstream) and not is_empty:
The patched attached fixed the thing.
Regards,
--
Arnaud Cornet
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.22.6-sexy (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages git-buildpackage depends on:
ii devscripts 2.10.9 Scripts to make the life of a Debi
ii git-core 1:1.5.3.4-1 fast, scalable, distributed revisi
ii python 2.4.4-6 An interactive high-level object-o
ii python-support 0.7.4 automated rebuilding support for p
git-buildpackage recommends no packages.
-- no debconf information
Seulement dans git-buildpackage-0.4.4.new/gbp: gbp_version.py
diff -ru git-buildpackage-0.4.4/git-import-orig
git-buildpackage-0.4.4.new/git-import-orig
--- git-buildpackage-0.4.4/git-import-orig 2007-10-19 09:58:35.000000000
+0200
+++ git-buildpackage-0.4.4.new/git-import-orig 2007-10-24 21:50:06.000000000
+0200
@@ -137,12 +137,12 @@
else:
is_empty = True
- if not repo.has_branch(options.upstream) and not is_empty:
+ if not repo.has_branch(options.upstream_branch) and not is_empty:
print >>sys.stderr, """
Repository does not have branch '%s' for upstream sources. If there is none see
/usr/share/doc/git-buildpackage/manual-html/gbpc.import.convert.html on howto
create it otherwise use --upstream-branch to specify it.
-""" % options.upstream_upstream
+""" % options.upstream_branch
raise GbpError
if options.version:
