keyids in "apt-key del" should be case-insensitive

[apt.git] / cmdline / apt-cdrom.cc

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 17a60ddcb38d597ec1a4ce35d9df9961acac7e52..53efe65b89afcfeac2d5abbab55c291aaf261b67 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -20,33 +20,20 @@
 #include <apt-pkg/progress.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/strutl.h>

-#include <apt-pkg/acquire.h>
-#include <apt-pkg/acquire-item.h>

 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgsystem.h>
 
 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgsystem.h>
 

-#include <locale.h>

 #include <iostream>
 #include <iostream>

-#include <fstream>

 #include <vector>
 #include <vector>

-#include <algorithm>
+#include <string>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <fcntl.h>
-#include <dirent.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <stdio.h>

 
 #include <apt-private/private-cmndline.h>
 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apt-private/private-cmndline.h>
 
 #include <apti18n.h>
                                                                        /*}}}*/

-static const char *W_NO_CDROM_FOUND = \
-   N_("No CD-ROM could be auto-detected or found using "
-      "the default mount point.\n"
-      "You may try the --cdrom option to set the CD-ROM mount point. "
-      "See 'man apt-cdrom' for more "
-      "information about the CD-ROM auto-detection and mount point.");

 
 using namespace std;
 
 
 using namespace std;
 


@@ -54,7 +41,7 @@ class pkgCdromTextStatus : public pkgCdromStatus                      /*{{{*/
 {
 protected:
    OpTextProgress Progress;
 {
 protected:
    OpTextProgress Progress;

-   void Prompt(const char *Text); 
+   void Prompt(const char *Text);

    string PromptLine(const char *Text);
    bool AskCdromName(string &name);
 
    string PromptLine(const char *Text);
    bool AskCdromName(string &name);
 


@@ -64,12 +51,12 @@ public:
    virtual OpProgress* GetOpProgress();
 };
 
    virtual OpProgress* GetOpProgress();
 };
 

-void pkgCdromTextStatus::Prompt(const char *Text) 
+void pkgCdromTextStatus::Prompt(const char *Text)

 {
    char C;
    cout << Text << ' ' << flush;
    if (read(STDIN_FILENO,&C,1) < 0)
 {
    char C;
    cout << Text << ' ' << flush;
    if (read(STDIN_FILENO,&C,1) < 0)

-      _error->Errno("pkgCdromTextStatus::Prompt", 
+      _error->Errno("pkgCdromTextStatus::Prompt",

                     "Failed to read from standard input (not a terminal?)");
    if (C != '\n')
       cout << endl;
                     "Failed to read from standard input (not a terminal?)");
    if (C != '\n')
       cout << endl;


@@ -78,134 +65,144 @@ void pkgCdromTextStatus::Prompt(const char *Text)
 string pkgCdromTextStatus::PromptLine(const char *Text)
 {
    cout << Text << ':' << endl;
 string pkgCdromTextStatus::PromptLine(const char *Text)
 {
    cout << Text << ':' << endl;

-   
+

    string Res;
    getline(cin,Res);
    return Res;
 }
 
    string Res;
    getline(cin,Res);
    return Res;
 }
 

-bool pkgCdromTextStatus::AskCdromName(string &name) 
+bool pkgCdromTextStatus::AskCdromName(string &name)

 {
    cout << _("Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'") << flush;
    name = PromptLine("");
 {
    cout << _("Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'") << flush;
    name = PromptLine("");

-        
+

    return true;
 }
    return true;
 }

-   

 
 

-void pkgCdromTextStatus::Update(string text, int current) 
+
+void pkgCdromTextStatus::Update(string text, int /*current*/)

 {
    if(text.size() > 0)
       cout << text << flush;
 }
 
 {
    if(text.size() > 0)
       cout << text << flush;
 }
 

-bool pkgCdromTextStatus::ChangeCdrom() 
+bool pkgCdromTextStatus::ChangeCdrom()

 {
    Prompt(_("Please insert a Disc in the drive and press enter"));
    return true;
 }
 
 {
    Prompt(_("Please insert a Disc in the drive and press enter"));
    return true;
 }
 

-OpProgress* pkgCdromTextStatus::GetOpProgress() 
-{ 
-   return &Progress; 
-};
+APT_CONST OpProgress* pkgCdromTextStatus::GetOpProgress()
+{
+   return &Progress;
+}

                                                                        /*}}}*/
                                                                        /*}}}*/

-// SetupAutoDetect                                                     /*{{{*/
-bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i)
+// AddOrIdent - Add or Ident a CDROM                                   /*{{{*/
+static bool AddOrIdent(bool const Add)

 {
 {

-   bool Debug =  _config->FindB("Debug::Acquire::cdrom", false);
+   pkgUdevCdromDevices UdevCdroms;
+   pkgCdromTextStatus log;
+   pkgCdrom cdrom;

 
 

-   vector<struct CdromDevice> v = UdevCdroms.Scan();
-   if (i >= v.size())
-      return false;
+   bool oneSuccessful = false;
+   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);
+   if (AutoDetect == true && UdevCdroms.Dlopen() == true)
+   {
+      bool const Debug = _config->FindB("Debug::Acquire::cdrom", false);
+      std::string const CDMount = _config->Find("Acquire::cdrom::mount");
+      bool const NoMount = _config->FindB("APT::CDROM::NoMount", false);
+      if (NoMount == false)
+        _config->Set("APT::CDROM::NoMount", true);
+
+      vector<struct CdromDevice> const v = UdevCdroms.Scan();
+      for (std::vector<struct CdromDevice>::const_iterator cd = v.begin(); cd != v.end(); ++cd)
+      {
+        if (Debug)
+           clog << "Looking at device:"
+              << "\tDeviveName: '" << cd->DeviceName << "'"
+              << "\tIsMounted: '" << cd->Mounted << "'"
+              << "\tMountPoint: '" << cd->MountPath << "'"
+              << endl;
+
+        std::string AptMountPoint;
+        if (cd->Mounted)
+           _config->Set("Acquire::cdrom::mount", cd->MountPath);
+        else if (NoMount == true)
+           continue;
+        else
+        {
+           AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+           if (FileExists(AptMountPoint) == false)
+              mkdir(AptMountPoint.c_str(), 0750);
+           if(MountCdrom(AptMountPoint, cd->DeviceName) == false)
+           {
+              _error->Warning(_("Failed to mount '%s' to '%s'"), cd->DeviceName.c_str(), AptMountPoint.c_str());
+              continue;
+           }
+           _config->Set("Acquire::cdrom::mount", AptMountPoint);
+        }
+
+        _error->PushToStack();
+        if (Add == true)
+           oneSuccessful = cdrom.Add(&log);
+        else
+        {
+           std::string id;
+           oneSuccessful = cdrom.Ident(id, &log);
+        }
+        _error->MergeWithStack();

 
 

-   if (Debug)
-      clog << "Looking at devce " << i
-          << " DeviveName: " << v[i].DeviceName 
-          << " IsMounted: '" << v[i].Mounted << "'"
-          << " MountPoint: '" << v[i].MountPath << "'"
-          << endl;
+        if (AptMountPoint.empty() == false)
+           UnmountCdrom(AptMountPoint);
+      }
+      if (NoMount == false)
+        _config->Set("APT::CDROM::NoMount", NoMount);
+      _config->Set("Acquire::cdrom::mount", CDMount);
+   }

 
 

-   if (v[i].Mounted)
+   // fallback if auto-detect didn't work
+   if (oneSuccessful == false)

    {
    {

-      // set the right options
-      _config->Set("Acquire::cdrom::mount", v[i].MountPath);
-      _config->Set("APT::CDROM::NoMount", true);
-   } else {
-      string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
-      if (!FileExists(AptMountPoint))
-        mkdir(AptMountPoint.c_str(), 0750);
-      if(MountCdrom(AptMountPoint, v[i].DeviceName) == false)
-        _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint.c_str());
-      _config->Set("Acquire::cdrom::mount", AptMountPoint);
-      _config->Set("APT::CDROM::NoMount", true);
+      _error->PushToStack();
+      if (Add == true)
+        oneSuccessful = cdrom.Add(&log);
+      else
+      {
+        std::string id;
+        oneSuccessful = cdrom.Ident(id, &log);
+      }
+      _error->MergeWithStack();

    }
    }

-   i++;

 
 

-   return true;
+   if (oneSuccessful == false)
+      _error->Error("%s", _("No CD-ROM could be auto-detected or found using the default mount point.\n"
+      "You may try the --cdrom option to set the CD-ROM mount point.\n"
+      "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and mount point."));
+   else if (Add == true)
+      cout << _("Repeat this process for the rest of the CDs in your set.") << endl;
+
+   return oneSuccessful;

 }
                                                                        /*}}}*/
 // DoAdd - Add a new CDROM                                             /*{{{*/
 // ---------------------------------------------------------------------
 /* This does the main add bit.. We show some status and things. The
 }
                                                                        /*}}}*/
 // DoAdd - Add a new CDROM                                             /*{{{*/
 // ---------------------------------------------------------------------
 /* This does the main add bit.. We show some status and things. The

-   sequence is to mount/umount the CD, Ident it then scan it for package 
+   sequence is to mount/umount the CD, Ident it then scan it for package

    files and reduce that list. Then we copy over the package files and
    verify them. Then rewrite the database files */
    files and reduce that list. Then we copy over the package files and
    verify them. Then rewrite the database files */

-bool DoAdd(CommandLine &)
+static bool DoAdd(CommandLine &)

 {
 {

-   pkgUdevCdromDevices UdevCdroms;
-   pkgCdromTextStatus log;
-   pkgCdrom cdrom;
-   bool res = true;
-
-   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);
-   unsigned int count = 0;
-   if (AutoDetect && UdevCdroms.Dlopen())
-      while (AutoDetectCdrom(UdevCdroms, count))
-        res &= cdrom.Add(&log);
-   if (count == 0) {
-      res = cdrom.Add(&log);
-      if (res == false) {
-         _error->Error("%s", _(W_NO_CDROM_FOUND));
-      }
-   }
-
-   if(res)
-      cout << _("Repeat this process for the rest of the CDs in your set.") << endl;
-
-   return res;
+   return AddOrIdent(true);

 }
                                                                        /*}}}*/
 // DoIdent - Ident a CDROM                                             /*{{{*/
 }
                                                                        /*}}}*/
 // DoIdent - Ident a CDROM                                             /*{{{*/

-// ---------------------------------------------------------------------
-/* */
-bool DoIdent(CommandLine &)
+static bool DoIdent(CommandLine &)

 {
 {

-   pkgUdevCdromDevices UdevCdroms;
-   string ident;
-   pkgCdromTextStatus log;
-   pkgCdrom cdrom;
-   bool res = true;
-
-   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
-
-   unsigned int count = 0;
-   if (AutoDetect && UdevCdroms.Dlopen())
-      while (AutoDetectCdrom(UdevCdroms, count))
-        res &= cdrom.Ident(ident, &log);
-   if (count == 0) {
-      res = cdrom.Ident(ident, &log);
-      if (res == false) {
-         _error->Error("%s", _(W_NO_CDROM_FOUND));
-      }
-   }
-   return res;
+   return AddOrIdent(false);

 }
                                                                        /*}}}*/
 // ShowHelp - Show the help screen                                     /*{{{*/
 }
                                                                        /*}}}*/
 // ShowHelp - Show the help screen                                     /*{{{*/

-// ---------------------------------------------------------------------
-/* */
-bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &)

 {
    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
 {
    ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);


@@ -271,14 +268,12 @@ int main(int argc,const char *argv[])                                     /*{{{*/
       _config->Set("quiet","1");
    
    // Match the operation
       _config->Set("quiet","1");
    
    // Match the operation

-   CmdL.DispatchArg(Cmds);
+   bool returned = CmdL.DispatchArg(Cmds);

 
 

-   // Print any errors or warnings found during parsing
-   bool const Errors = _error->PendingError();

    if (_config->FindI("quiet",0) > 0)
       _error->DumpErrors();
    else
       _error->DumpErrors(GlobalError::DEBUG);
    if (_config->FindI("quiet",0) > 0)
       _error->DumpErrors();
    else
       _error->DumpErrors(GlobalError::DEBUG);

-   return Errors == true ? 100 : 0;
+   return returned == true ? 0 : 100;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/