* cmdline/apt-cache.cc:

  - remove not implemented 'apt-cache add' command
* doc/apt-cache.8.xml:
  - describe reality as apt-cache just queries and doesn't manipulate
    the caches. Thanks to Enrico Zini for spotting it! (Closes: #612009)

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 45ea50433805971898377a208ecc6ab62246a690..34070ba9b29e245ff5e6f651a0c8d3f09159df2f 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1116,58 +1116,6 @@ bool Dotty(CommandLine &CmdL)
    
    printf("}\n");
    return true;
    
    printf("}\n");
    return true;

-}
-                                                                       /*}}}*/
-// DoAdd - Perform an adding operation                                 /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool DoAdd(CommandLine &CmdL)
-{
-   return _error->Error("Unimplemented");
-#if 0   
-   // Make sure there is at least one argument
-   if (CmdL.FileSize() <= 1)
-      return _error->Error("You must give at least one file name");
-   
-   // Open the cache
-   FileFd CacheF(_config->FindFile("Dir::Cache::pkgcache"),FileFd::WriteAny);
-   if (_error->PendingError() == true)
-      return false;
-   
-   DynamicMMap Map(CacheF,MMap::Public);
-   if (_error->PendingError() == true)
-      return false;
-
-   OpTextProgress Progress(*_config);
-   pkgCacheGenerator Gen(Map,Progress);
-   if (_error->PendingError() == true)
-      return false;
-
-   unsigned long Length = CmdL.FileSize() - 1;
-   for (const char **I = CmdL.FileList + 1; *I != 0; I++)
-   {
-      Progress.OverallProgress(I - CmdL.FileList,Length,1,"Generating cache");
-      Progress.SubProgress(Length);
-
-      // Do the merge
-      FileFd TagF(*I,FileFd::ReadOnly);
-      debListParser Parser(TagF);
-      if (_error->PendingError() == true)
-        return _error->Error("Problem opening %s",*I);
-      
-      if (Gen.SelectFile(*I,"") == false)
-        return _error->Error("Problem with SelectFile");
-        
-      if (Gen.MergeList(Parser) == false)
-        return _error->Error("Problem with MergeList");
-   }
-
-   Progress.Done();
-   GCache = &Gen.GetCache();
-   Stats(CmdL);
-   
-   return true;
-#endif   

 }
                                                                        /*}}}*/
 // DisplayRecord - Displays the complete record for the package                /*{{{*/
 }
                                                                        /*}}}*/
 // DisplayRecord - Displays the complete record for the package                /*{{{*/


@@ -1743,15 +1691,13 @@ bool ShowHelp(CommandLine &Cmd)
 
    cout << 
     _("Usage: apt-cache [options] command\n"
 
    cout << 
     _("Usage: apt-cache [options] command\n"

-      "       apt-cache [options] add file1 [file2 ...]\n"

       "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
       "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
       "\n"
       "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
       "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
       "\n"

-      "apt-cache is a low-level tool used to manipulate APT's binary\n"
-      "cache files, and query information from them\n"
+      "apt-cache is a low-level tool used to query information\n"
+      "from APT's binary cache files\n"

       "\n"
       "Commands:\n"
       "\n"
       "Commands:\n"

-      "   add - Add a package file to the source cache\n"

       "   gencaches - Build both the package and source cache\n"
       "   showpkg - Show some general information for a single package\n"
       "   showsrc - Show source records\n"
       "   gencaches - Build both the package and source cache\n"
       "   showpkg - Show some general information for a single package\n"
       "   showsrc - Show source records\n"


@@ -1811,7 +1757,6 @@ int main(int argc,const char *argv[])                                     /*{{{*/
       {0,"enhances","APT::Cache::ShowEnhances",0},
       {0,0,0,0}};
    CommandLine::Dispatch CmdsA[] = {{"help",&ShowHelp},
       {0,"enhances","APT::Cache::ShowEnhances",0},
       {0,0,0,0}};
    CommandLine::Dispatch CmdsA[] = {{"help",&ShowHelp},

-                                    {"add",&DoAdd},

                                     {"gencaches",&GenCaches},
                                     {"showsrc",&ShowSrcPackage},
                                     {0,0}};
                                     {"gencaches",&GenCaches},
                                     {"showsrc",&ShowSrcPackage},
                                     {0,0}};

diff --git a/debian/changelog b/debian/changelog
index 52565473270c204e9ec0826899fd1fb8e1719496..3f8f52101486ce2150438fe41eb52e55d5fb4327 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -70,6 +70,11 @@ apt (0.8.11) UNRELEASED; urgency=low
     - print a good error message if FileSize() is zero
   * apt-pkg/aptconfiguration.cc:
     - remove the inbuilt Translation files whitelist
     - print a good error message if FileSize() is zero
   * apt-pkg/aptconfiguration.cc:
     - remove the inbuilt Translation files whitelist

+  * cmdline/apt-cache.cc:
+    - remove not implemented 'apt-cache add' command
+  * doc/apt-cache.8.xml:
+    - describe reality as apt-cache just queries and doesn't manipulate
+      the caches. Thanks to Enrico Zini for spotting it! (Closes: #612009)

 
   [ Michael Vogt ]
   * methods/http.cc:
 
   [ Michael Vogt ]
   * methods/http.cc:


@@ -87,7 +92,7 @@ apt (0.8.11) UNRELEASED; urgency=low
       will actually test uncompressed indexes regardless of the internal
       default value of Acquire::GzipIndexes.
 
       will actually test uncompressed indexes regardless of the internal
       default value of Acquire::GzipIndexes.
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 28 Jan 2011 12:22:25 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 04 Feb 2011 22:52:25 +0100

 
 apt (0.8.10.3) unstable; urgency=low
 
 
 apt (0.8.10.3) unstable; urgency=low
 

diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 359d210eab82383e2296f8dadd8f8b1ed69466bf..9c6c64daca7f7d7d899687eba4c9d34f11890b72 100644 (file)
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -18,7 +18,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
    &apt-email;
    &apt-product;
    <!-- The last update date -->

-   <date>29 February 2004</date>
+   <date>04 February 2011</date>

  </refentryinfo>
  
  <refmeta>
  </refentryinfo>
  
  <refmeta>


@@ -30,7 +30,7 @@
  <!-- Man page title -->
  <refnamediv>
     <refname>apt-cache</refname>
  <!-- Man page title -->
  <refnamediv>
     <refname>apt-cache</refname>

-    <refpurpose>APT package handling utility -- cache manipulator</refpurpose>
+    <refpurpose>query the APT cache</refpurpose>

  </refnamediv>
 
  <!-- Arguments -->
  </refnamediv>
 
  <!-- Arguments -->


@@ -41,7 +41,6 @@
       <arg><option>-o=<replaceable>config string</replaceable></option></arg>
       <arg><option>-c=<replaceable>file</replaceable></option></arg>
       <group choice="req">
       <arg><option>-o=<replaceable>config string</replaceable></option></arg>
       <arg><option>-c=<replaceable>file</replaceable></option></arg>
       <group choice="req">

-         <arg>add <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg></arg>

          <arg>gencaches</arg>
          <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
          <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
          <arg>gencaches</arg>
          <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
          <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>


@@ -72,11 +71,6 @@
    commands below must be present.</para>
 
    <variablelist>
    commands below must be present.</para>
 
    <variablelist>

-     <varlistentry><term>add <replaceable>file(s)</replaceable></term>
-     <listitem><para><literal>add</literal> adds the named package index files to the package cache.
-     This is for debugging only.</para></listitem>
-     </varlistentry>
-     

      <varlistentry><term>gencaches</term>
      <listitem><para><literal>gencaches</literal> performs the same operation as 
      <command>apt-get check</command>. It builds the source and package caches from 
      <varlistentry><term>gencaches</term>
      <listitem><para><literal>gencaches</literal> performs the same operation as 
      <command>apt-get check</command>. It builds the source and package caches from