trigger the usage of the fallback code for kfreebsd also in the

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

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 0c9aab28cb99915265ffec7a471625c099034ac7..2551f49161e9fc07fe5b775a708e339a6e816eb9 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -11,6 +11,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include<config.h>
+

 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>


@@ -21,10 +23,8 @@
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/cdrom.h>

-#include <config.h>
-#include <apti18n.h>
-    
-//#include "indexcopy.h"
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/pkgsystem.h>

 
 #include <locale.h>
 #include <iostream>
 
 #include <locale.h>
 #include <iostream>


@@ -36,6 +36,8 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <stdio.h>

+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 using namespace std;
                                                                        /*}}}*/
 
 using namespace std;


@@ -147,11 +149,10 @@ bool DoAdd(CommandLine &)
    pkgCdrom cdrom;
    bool res = true;
 
    pkgCdrom cdrom;
    bool res = true;
 

-   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
-   unsigned int count = 0;
-   
+   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);

    if (AutoDetect && UdevCdroms.Dlopen())
    {
    if (AutoDetect && UdevCdroms.Dlopen())
    {

+      unsigned int count = 0;

       while (AutoDetectCdrom(UdevCdroms, count))
         res &= cdrom.Add(&log);
    } else {
       while (AutoDetectCdrom(UdevCdroms, count))
         res &= cdrom.Add(&log);
    } else {


@@ -176,10 +177,10 @@ bool DoIdent(CommandLine &)
    bool res = true;
 
    bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
    bool res = true;
 
    bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");

-   unsigned int count = 0;
-   
+

    if (AutoDetect && UdevCdroms.Dlopen())
    {
    if (AutoDetect && UdevCdroms.Dlopen())
    {

+      unsigned int count = 0;

       while (AutoDetectCdrom(UdevCdroms, count))
         res &= cdrom.Ident(ident, &log);
    } else {
       while (AutoDetectCdrom(UdevCdroms, count))
         res &= cdrom.Ident(ident, &log);
    } else {


@@ -194,7 +195,7 @@ bool DoIdent(CommandLine &)
 /* */
 int ShowHelp()
 {
 /* */
 int ShowHelp()
 {

-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,

            COMMON_ARCH,__DATE__,__TIME__);
    if (_config->FindB("version") == true)
       return 0;
            COMMON_ARCH,__DATE__,__TIME__);
    if (_config->FindB("version") == true)
       return 0;


@@ -266,20 +267,18 @@ int main(int argc,const char *argv[])                                     /*{{{*/
       return ShowHelp();
 
    // Deal with stdout not being a tty
       return ShowHelp();
 
    // Deal with stdout not being a tty

-   if (isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
+   if (isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)

       _config->Set("quiet","1");
    
    // Match the operation
    CmdL.DispatchArg(Cmds);
 
    // Print any errors or warnings found during parsing
       _config->Set("quiet","1");
    
    // Match the operation
    CmdL.DispatchArg(Cmds);
 
    // Print any errors or warnings found during parsing

-   if (_error->empty() == false)
-   {
-      bool Errors = _error->PendingError();
+   bool const Errors = _error->PendingError();
+   if (_config->FindI("quiet",0) > 0)

       _error->DumpErrors();
       _error->DumpErrors();

-      return Errors == true?100:0;
-   }
-   
-   return 0;
+   else
+      _error->DumpErrors(GlobalError::DEBUG);
+   return Errors == true ? 100 : 0;

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