From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:53:44 +0000 (+0000)
Subject: Changed handling of the -q option
X-Git-Tag: 0.7.24ubuntu1~1364
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/9435cc9b1f36b621948ff26364ccd65b028b70a6

Changed handling of the -q option
Author: jgg
Date: 1999-05-14 02:57:48 GMT
Changed handling of the -q option
---

diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 3c3717c99..36039c3b8 100644
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: cmndline.cc,v 1.9 1999/01/27 02:48:52 jgg Exp $
+// $Id: cmndline.cc,v 1.10 1999/05/14 02:57:48 jgg Exp $
 /* ######################################################################
 
    Command Line Class - Sophisticated command line parser
@@ -228,7 +228,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
 	    return _error->Error("Option %s requires an integer argument, not '%s'",argv[I],Argument);
 
 	 // Conversion was ok, set the value and return
-	 if (EndPtr != Argument)
+	 if (EndPtr != 0 && EndPtr != Argument && *EndPtr == 0)
 	 {
 	    Conf->Set(A->ConfName,Value);
 	    Opt += strlen(Opt);
diff --git a/debian/changelog b/debian/changelog
index fe0824efc..689f6bdae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ apt (0.3.6.1) unstable; urgency=low
   * Fixed missing text in the apt-get(8) page. Closes: #37596
   * Made --simulate and friends work with apt-get source. Closes: #37597
   * Fixed inclusion of man pages in the -doc/-dev package. Closes: #37633
-  
+  * Fixed handling of the -q option with not-entirely integer arguments
+    Closes: #37499
+    
  -- Jason Gunthorpe <jgg@debian.org>  Wed, 12 May 1999 09:18:49 -0700
  
 apt (0.3.6) unstable; urgency=low