* New no_NO.po file from Tollef Fog Heen <tfheen@debian...

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

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index aad4dff1a02bc449a10f95829e306719d911d22e..7367a55a316f23187e15e541806a0eae1bb0a097 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-cdrom.cc,v 1.38 2001/05/27 04:46:43 jgg Exp $
+// $Id: apt-cdrom.cc,v 1.45 2003/11/19 23:50:51 mdz Exp $

 /* ######################################################################
    
    APT CDROM - Tool for handling APT's CDROM database.
 /* ######################################################################
    
    APT CDROM - Tool for handling APT's CDROM database.


@@ -23,6 +23,7 @@
     
 #include "indexcopy.h"
 
     
 #include "indexcopy.h"
 

+#include <locale.h>

 #include <iostream>
 #include <fstream>
 #include <vector>
 #include <iostream>
 #include <fstream>
 #include <vector>


@@ -63,6 +64,10 @@ bool FindPackages(string CD,vector<string> &List,vector<string> &SList,
         InfoDir = CD + ".disk/";
    }
 
         InfoDir = CD + ".disk/";
    }
 

+   // Don't look into directories that have been marked to ingore.
+   if (stat(".aptignr",&Buf) == 0)
+      return true;
+   

    /* Aha! We found some package files. We assume that everything under 
       this dir is controlled by those package files so we don't look down
       anymore */
    /* Aha! We found some package files. We assume that everything under 
       this dir is controlled by those package files so we don't look down
       anymore */


@@ -96,7 +101,8 @@ bool FindPackages(string CD,vector<string> &List,vector<string> &SList,
          //strcmp(Dir->d_name,"source") == 0 ||
          strcmp(Dir->d_name,".disk") == 0 ||
          strcmp(Dir->d_name,"experimental") == 0 ||
          //strcmp(Dir->d_name,"source") == 0 ||
          strcmp(Dir->d_name,".disk") == 0 ||
          strcmp(Dir->d_name,"experimental") == 0 ||

-         strcmp(Dir->d_name,"binary-all") == 0)
+         strcmp(Dir->d_name,"binary-all") == 0 ||
+          strcmp(Dir->d_name,"debian-installer") == 0)

         continue;
 
       // See if the name is a sub directory
         continue;
 
       // See if the name is a sub directory


@@ -170,7 +176,7 @@ bool DropBinaryArch(vector<string> &List)
 // Score - We compute a 'score' for a path                             /*{{{*/
 // ---------------------------------------------------------------------
 /* Paths are scored based on how close they come to what I consider
 // Score - We compute a 'score' for a path                             /*{{{*/
 // ---------------------------------------------------------------------
 /* Paths are scored based on how close they come to what I consider

-   normal. That is ones that have 'dist' 'stable' 'frozen' will score
+   normal. That is ones that have 'dist' 'stable' 'testing' will score

    higher than ones without. */
 int Score(string Path)
 {
    higher than ones without. */
 int Score(string Path)
 {


@@ -179,7 +185,7 @@ int Score(string Path)
       Res += 29;
    if (Path.find("/binary-") != string::npos)
       Res += 20;
       Res += 29;
    if (Path.find("/binary-") != string::npos)
       Res += 20;

-   if (Path.find("frozen/") != string::npos)
+   if (Path.find("testing/") != string::npos)

       Res += 28;
    if (Path.find("unstable/") != string::npos)
       Res += 27;
       Res += 28;
    if (Path.find("unstable/") != string::npos)
       Res += 27;


@@ -772,7 +778,11 @@ int main(int argc,const char *argv[])
       {"add",&DoAdd},
       {"ident",&DoIdent},
       {0,0}};
       {"add",&DoAdd},
       {"ident",&DoIdent},
       {0,0}};

-        
+
+   // Set up gettext support
+   setlocale(LC_ALL,"");
+   textdomain(PACKAGE);
+

    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
    if (pkgInitConfig(*_config) == false ||
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
    if (pkgInitConfig(*_config) == false ||


@@ -789,7 +799,7 @@ 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 (ttyname(STDOUT_FILENO) == 0 && _config->FindI("quiet",0) < 1)
+   if (isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)

       _config->Set("quiet","1");
    
    // Match the operation
       _config->Set("quiet","1");
    
    // Match the operation