From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 17:02:36 +0000 (+0000)
Subject: * Patch from Otavio Salvador to exit successfully after...
X-Git-Tag: 0.7.24ubuntu1~687
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b13af988f4ad021695c1f1585dce72fdc8e5a336

* Patch from Otavio Salvador to exit successfully after...
Author: mdz
Date: 2003-08-01 20:27:13 GMT
* Patch from Otavio Salvador to exit successfully after --version
(Closes: #203418)
---

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index a9e9e6062..bcf4e1c0f 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: apt-cache.cc,v 1.65 2003/07/22 03:10:01 mdz Exp $
+// $Id: apt-cache.cc,v 1.66 2003/08/01 20:27:13 mdz Exp $
 /* ######################################################################
    
    apt-cache - Manages the cache files
@@ -1581,6 +1581,9 @@ bool ShowHelp(CommandLine &Cmd)
    ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
 	    COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
    
+   if (_config->FindB("version") == true)
+     return true;
+
    cout << 
     _("Usage: apt-cache [options] command\n"
       "       apt-cache [options] add file1 [file2 ...]\n"
diff --git a/debian/changelog b/debian/changelog
index dda5dd9ad..f180f22ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ apt (0.5.9) unstable; urgency=low
 
   * Fix typo in example ftp-archive.conf (Closes: #203295)
   * Mention default setting for --all-versions (Closes: #203298)
+  * Patch from Otavio Salvador to exit successfully after --version
+    (Closes: #203418)
 
  --