Package: git-buildpackage
Version: 0.5.17
Severity: minor
Tags: patch

Was looking forward to trying git import-dscs.  So:

 $ man git import-dscs | grep debsnap | head -1
        git-import-dscs --debsnap [ git-import-dsc options ]

Okay, let's try it.

 $ git import-dscs --debsnap
 Traceback (most recent call last):
   File "/usr/bin/git-import-dscs", line 144, in <module>
     sys.exit(main(sys.argv))
   File "/usr/bin/git-import-dscs", line 93, in main
     pkg = import_args[-1]
 IndexError: list index out of range

Patches attached.
>From 337be79a9640b4e1c0d6e0b1112dbc001f3e5743 Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrnie...@gmail.com>
Date: Mon, 17 Jan 2011 19:06:54 -0600
Subject: [PATCH 1/2] git-import-dscs --debsnap: Dump usage if argument is 
missing

---
 git-import-dscs |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/git-import-dscs b/git-import-dscs
index 6571eb0..369d7f7 100755
--- a/git-import-dscs
+++ b/git-import-dscs
@@ -90,6 +90,9 @@ def main(argv):
         if '--debsnap' in import_args:
             use_debsnap = True
             import_args.remove('--debsnap')
+            if import_args == []:
+                print_help()
+                raise GbpError
             pkg = import_args[-1]
             import_args = import_args[:-1]
         else:
-- 
1.7.4.rc2

>From e939c9c967c8a3e258f345a1ae408f1140598e70 Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrnie...@gmail.com>
Date: Mon, 17 Jan 2011 19:13:33 -0600
Subject: [PATCH 2/2] Document git-import-dscs --debsnap argument

The --debsnap form of git import-dscs takes a <package> argument.
---
 docs/manpages/git-import-dscs.sgml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/docs/manpages/git-import-dscs.sgml 
b/docs/manpages/git-import-dscs.sgml
index b31f4ac..f14a433 100644
--- a/docs/manpages/git-import-dscs.sgml
+++ b/docs/manpages/git-import-dscs.sgml
@@ -32,6 +32,7 @@
       &git-import-dscs;
       <arg choice="req">--debsnap</arg>
       <arg><option>git-import-dsc options</option></arg>
+      <arg choice="req"><replaceable>package</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
   <refsect1>
-- 
1.7.4.rc2

Reply via email to