r8724: Automated commit for Debian build of getopt upstream-version-1.1.0

diff --git a/debian/changelog b/debian/changelog
index a685af54f0d921302dc3832a5ce150ea5c0c77ba..512f25ccf81bfbd8c698c656d0e400c0afbdbedf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-getopt (1.1.0-1) unstable; urgency=low
+
+  * Add patch from Mark Simpson. Bug fix and new test.
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 14 Mar 2004 15:37:04 -0700
+
 cl-getopt (1.0.1-1) unstable; urgency=low
 
   * Remove extraneous fasls

diff --git a/main.lisp b/main.lisp
index 885ab096c259c512908f962fda1292503b9b31c9..b6b5070fa5ca15913dce2f11763a90d948a5bb43 100644 (file)
--- a/main.lisp
+++ b/main.lisp
@@ -109,7 +109,7 @@ opts is a list of option lists. The fields of the list are
        (multiple-value-bind (option-list option-type base-name argument)
            (match-option (car pos) options)
          (cond
-           (option-list
+           ((and option-list (not (eq option-type :arg)))
             (cond
               (argument
                (case (second option-list)

diff --git a/tests.lisp b/tests.lisp
index 26b2c48df464759b1c5752bd90514186e635a473..5790baaa35ab825d6f370ae279a3dffc97dc4291 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -66,5 +66,7 @@
               (getopt '("--a=10") '(("along" :optional)))) 
       (test-mv '(nil nil ("a"))
               (getopt '("--a=10") '(("along" :optional) ("aboot" :optional))))
+      (test-mv '(("a") nil nil)
+               (getopt '("a") '(("a" :none))))
       ))
   t)