Explorar el Código

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

Arch Librarian hace 22 años
padre
commit
9435cc9b1f
Se han modificado 2 ficheros con 5 adiciones y 3 borrados
  1. 2 2
      apt-pkg/contrib/cmndline.cc
  2. 3 1
      debian/changelog

+ 2 - 2
apt-pkg/contrib/cmndline.cc

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // 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
    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);
 	    return _error->Error("Option %s requires an integer argument, not '%s'",argv[I],Argument);
 
 
 	 // Conversion was ok, set the value and return
 	 // Conversion was ok, set the value and return
-	 if (EndPtr != Argument)
+	 if (EndPtr != 0 && EndPtr != Argument && *EndPtr == 0)
 	 {
 	 {
 	    Conf->Set(A->ConfName,Value);
 	    Conf->Set(A->ConfName,Value);
 	    Opt += strlen(Opt);
 	    Opt += strlen(Opt);

+ 3 - 1
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
   * Fixed missing text in the apt-get(8) page. Closes: #37596
   * Made --simulate and friends work with apt-get source. Closes: #37597
   * Made --simulate and friends work with apt-get source. Closes: #37597
   * Fixed inclusion of man pages in the -doc/-dev package. Closes: #37633
   * 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
  -- Jason Gunthorpe <jgg@debian.org>  Wed, 12 May 1999 09:18:49 -0700
  
  
 apt (0.3.6) unstable; urgency=low
 apt (0.3.6) unstable; urgency=low