Merge from CVS

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 76945b805c32f9e4f9e8365d816f44e56da1f72f..0d7e5239c9052a93e92b42bdb98a6975fd6e83f3 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-get.cc,v 1.111 2001/11/04 17:09:18 tausq Exp $
+// $Id: apt-get.cc,v 1.156 2004/08/28 01:05:16 mdz Exp $

 /* ######################################################################
    
    apt-get - Cover for dpkg
 /* ######################################################################
    
    apt-get - Cover for dpkg


@@ -45,7 +45,9 @@
 
 #include "acqprogress.h"
 
 
 #include "acqprogress.h"
 

-#include <fstream.h>
+#include <locale.h>
+#include <langinfo.h>
+#include <fstream>

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


@@ -79,6 +81,13 @@ class CacheFile : public pkgCacheFile
    
    void Sort();
    bool CheckDeps(bool AllowBroken = false);
    
    void Sort();
    bool CheckDeps(bool AllowBroken = false);

+   bool BuildCaches(bool WithLock = true)
+   {
+      OpTextProgress Prog(*_config);
+      if (pkgCacheFile::BuildCaches(Prog,WithLock) == false)
+        return false;
+      return true;
+   }

    bool Open(bool WithLock = true) 
    {
       OpTextProgress Prog(*_config);
    bool Open(bool WithLock = true) 
    {
       OpTextProgress Prog(*_config);


@@ -104,26 +113,37 @@ class CacheFile : public pkgCacheFile
 /* Returns true on a Yes.*/
 bool YnPrompt()
 {
 /* Returns true on a Yes.*/
 bool YnPrompt()
 {

-   // This needs to be a capital
-   const char *Yes = _("Y");
-                          

    if (_config->FindB("APT::Get::Assume-Yes",false) == true)
    {
    if (_config->FindB("APT::Get::Assume-Yes",false) == true)
    {

-      c1out << Yes << endl;
+      c1out << _("Y") << endl;

       return true;
    }
       return true;
    }

-   
-   char C = 0;
-   char Jnk = 0;
-   if (read(STDIN_FILENO,&C,1) != 1)
+
+   char response[1024] = "";
+   cin.getline(response, sizeof(response));
+
+   if (!cin)

       return false;
       return false;

-   while (C != '\n' && Jnk != '\n') 
-      if (read(STDIN_FILENO,&Jnk,1) != 1)
-        return false;
+
+   if (strlen(response) == 0)
+      return true;
+
+   regex_t Pattern;
+   int Res;
+
+   Res = regcomp(&Pattern, nl_langinfo(YESEXPR),
+                 REG_EXTENDED|REG_ICASE|REG_NOSUB);
+
+   if (Res != 0) {
+      char Error[300];        
+      regerror(Res,&Pattern,Error,sizeof(Error));
+      return _error->Error(_("Regex compilation error - %s"),Error);
+   }

    
    

-   if (!(toupper(C) == *Yes || C == '\n' || C == '\r'))
-      return false;
-   return true;
+   Res = regexec(&Pattern, response, 0, NULL, 0);
+   if (Res == 0)
+      return true;
+   return false;

 }
                                                                        /*}}}*/
 // AnalPrompt - Annoying Yes No Prompt.                                        /*{{{*/
 }
                                                                        /*}}}*/
 // AnalPrompt - Annoying Yes No Prompt.                                        /*{{{*/


@@ -142,29 +162,59 @@ bool AnalPrompt(const char *Text)
 // ---------------------------------------------------------------------
 /* This prints out a string of space separated words with a title and 
    a two space indent line wraped to the current screen width. */
 // ---------------------------------------------------------------------
 /* This prints out a string of space separated words with a title and 
    a two space indent line wraped to the current screen width. */

-bool ShowList(ostream &out,string Title,string List)
+bool ShowList(ostream &out,string Title,string List,string VersionsList)

 {
    if (List.empty() == true)
       return true;
 {
    if (List.empty() == true)
       return true;

+   // trim trailing space
+   int NonSpace = List.find_last_not_of(' ');
+   if (NonSpace != -1)
+   {
+      List = List.erase(NonSpace + 1);
+      if (List.empty() == true)
+        return true;
+   }

 
    // Acount for the leading space
    int ScreenWidth = ::ScreenWidth - 3;
       
    out << Title << endl;
    string::size_type Start = 0;
 
    // Acount for the leading space
    int ScreenWidth = ::ScreenWidth - 3;
       
    out << Title << endl;
    string::size_type Start = 0;

+   string::size_type VersionsStart = 0;

    while (Start < List.size())
    {
    while (Start < List.size())
    {

-      string::size_type End;
-      if (Start + ScreenWidth >= List.size())
-        End = List.size();
-      else
-        End = List.rfind(' ',Start+ScreenWidth);
-
-      if (End == string::npos || End < Start)
-        End = Start + ScreenWidth;
-      out << "  " << string(List,Start,End - Start) << endl;
-      Start = End + 1;
+      if(_config->FindB("APT::Get::Show-Versions",false) == true &&
+         VersionsList.size() > 0) {
+         string::size_type End;
+         string::size_type VersionsEnd;
+         
+         End = List.find(' ',Start);
+         VersionsEnd = VersionsList.find('\n', VersionsStart);
+
+         out << "   " << string(List,Start,End - Start) << " (" << 
+            string(VersionsList,VersionsStart,VersionsEnd - VersionsStart) << 
+            ")" << endl;
+
+        if (End == string::npos || End < Start)
+           End = Start + ScreenWidth;
+
+         Start = End + 1;
+         VersionsStart = VersionsEnd + 1;
+      } else {
+         string::size_type End;
+
+         if (Start + ScreenWidth >= List.size())
+            End = List.size();
+         else
+            End = List.rfind(' ',Start+ScreenWidth);
+
+         if (End == string::npos || End < Start)
+            End = Start + ScreenWidth;
+         out << "  " << string(List,Start,End - Start) << endl;
+         Start = End + 1;
+      }

    }   
    }   

+

    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/


@@ -175,14 +225,14 @@ bool ShowList(ostream &out,string Title,string List)
    description.
    
    The output looks like:
    description.
    
    The output looks like:

- Sorry, but the following packages have unmet dependencies:
+ The following packages have unmet dependencies:

      exim: Depends: libc6 (>= 2.1.94) but 2.1.3-10 is to be installed
            Depends: libldap2 (>= 2.0.2-2) but it is not going to be installed
            Depends: libsasl7 but it is not going to be installed   
  */
 void ShowBroken(ostream &out,CacheFile &Cache,bool Now)
 {
      exim: Depends: libc6 (>= 2.1.94) but 2.1.3-10 is to be installed
            Depends: libldap2 (>= 2.0.2-2) but it is not going to be installed
            Depends: libsasl7 but it is not going to be installed   
  */
 void ShowBroken(ostream &out,CacheFile &Cache,bool Now)
 {

-   out << _("Sorry, but the following packages have unmet dependencies:") << endl;
+   out << _("The following packages have unmet dependencies:") << endl;

    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);
    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);


@@ -220,7 +270,7 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now)
         // Compute a single dependency element (glob or)
         pkgCache::DepIterator Start;
         pkgCache::DepIterator End;
         // Compute a single dependency element (glob or)
         pkgCache::DepIterator Start;
         pkgCache::DepIterator End;

-        D.GlobOr(Start,End);
+        D.GlobOr(Start,End); // advances D

 
         if (Cache->IsImportantDep(End) == false)
            continue;
 
         if (Cache->IsImportantDep(End) == false)
            continue;


@@ -307,17 +357,20 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now)
 /* */
 void ShowNew(ostream &out,CacheFile &Cache)
 {
 /* */
 void ShowNew(ostream &out,CacheFile &Cache)
 {

-   /* Print out a list of packages that are going to be removed extra
+   /* Print out a list of packages that are going to be installed extra

       to what the user asked */
    string List;
       to what the user asked */
    string List;

+   string VersionsList;

    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);
    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);

-      if (Cache[I].NewInstall() == true)
-        List += string(I.Name()) + " ";
+      if (Cache[I].NewInstall() == true) {
+         List += string(I.Name()) + " ";
+         VersionsList += string(Cache[I].CandVersion) + "\n";
+      }

    }
    
    }
    

-   ShowList(out,_("The following NEW packages will be installed:"),List);
+   ShowList(out,_("The following NEW packages will be installed:"),List,VersionsList);

 }
                                                                        /*}}}*/
 // ShowDel - Show packages to delete                                   /*{{{*/
 }
                                                                        /*}}}*/
 // ShowDel - Show packages to delete                                   /*{{{*/


@@ -328,6 +381,7 @@ void ShowDel(ostream &out,CacheFile &Cache)
    /* Print out a list of packages that are going to be removed extra
       to what the user asked */
    string List;
    /* Print out a list of packages that are going to be removed extra
       to what the user asked */
    string List;

+   string VersionsList;

    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);
    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);


@@ -337,10 +391,12 @@ void ShowDel(ostream &out,CacheFile &Cache)
            List += string(I.Name()) + "* ";
         else
            List += string(I.Name()) + " ";
            List += string(I.Name()) + "* ";
         else
            List += string(I.Name()) + " ";

+     
+     VersionsList += string(Cache[I].CandVersion)+ "\n";

       }
    }
    
       }
    }
    

-   ShowList(out,_("The following packages will be REMOVED:"),List);
+   ShowList(out,_("The following packages will be REMOVED:"),List,VersionsList);

 }
                                                                        /*}}}*/
 // ShowKept - Show kept packages                                       /*{{{*/
 }
                                                                        /*}}}*/
 // ShowKept - Show kept packages                                       /*{{{*/


@@ -349,6 +405,7 @@ void ShowDel(ostream &out,CacheFile &Cache)
 void ShowKept(ostream &out,CacheFile &Cache)
 {
    string List;
 void ShowKept(ostream &out,CacheFile &Cache)
 {
    string List;

+   string VersionsList;

    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {    
       pkgCache::PkgIterator I(Cache,Cache.List[J]);
    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {    
       pkgCache::PkgIterator I(Cache,Cache.List[J]);


@@ -359,8 +416,9 @@ void ShowKept(ostream &out,CacheFile &Cache)
         continue;
       
       List += string(I.Name()) + " ";
         continue;
       
       List += string(I.Name()) + " ";

+      VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";

    }
    }

-   ShowList(out,_("The following packages have been kept back"),List);
+   ShowList(out,_("The following packages have been kept back:"),List,VersionsList);

 }
                                                                        /*}}}*/
 // ShowUpgraded - Show upgraded packages                               /*{{{*/
 }
                                                                        /*}}}*/
 // ShowUpgraded - Show upgraded packages                               /*{{{*/


@@ -369,6 +427,7 @@ void ShowKept(ostream &out,CacheFile &Cache)
 void ShowUpgraded(ostream &out,CacheFile &Cache)
 {
    string List;
 void ShowUpgraded(ostream &out,CacheFile &Cache)
 {
    string List;

+   string VersionsList;

    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);
    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);


@@ -378,8 +437,9 @@ void ShowUpgraded(ostream &out,CacheFile &Cache)
         continue;
       
       List += string(I.Name()) + " ";
         continue;
       
       List += string(I.Name()) + " ";

+      VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";

    }
    }

-   ShowList(out,_("The following packages will be upgraded"),List);
+   ShowList(out,_("The following packages will be upgraded:"),List,VersionsList);

 }
                                                                        /*}}}*/
 // ShowDowngraded - Show downgraded packages                           /*{{{*/
 }
                                                                        /*}}}*/
 // ShowDowngraded - Show downgraded packages                           /*{{{*/


@@ -388,6 +448,7 @@ void ShowUpgraded(ostream &out,CacheFile &Cache)
 bool ShowDowngraded(ostream &out,CacheFile &Cache)
 {
    string List;
 bool ShowDowngraded(ostream &out,CacheFile &Cache)
 {
    string List;

+   string VersionsList;

    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);
    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);


@@ -397,8 +458,9 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache)
         continue;
       
       List += string(I.Name()) + " ";
         continue;
       
       List += string(I.Name()) + " ";

+      VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";

    }
    }

-   return ShowList(out,_("The following packages will be DOWNGRADED"),List);
+   return ShowList(out,_("The following packages will be DOWNGRADED:"),List,VersionsList);

 }
                                                                        /*}}}*/
 // ShowHold - Show held but changed packages                           /*{{{*/
 }
                                                                        /*}}}*/
 // ShowHold - Show held but changed packages                           /*{{{*/


@@ -407,15 +469,18 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache)
 bool ShowHold(ostream &out,CacheFile &Cache)
 {
    string List;
 bool ShowHold(ostream &out,CacheFile &Cache)
 {
    string List;

+   string VersionsList;

    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);
       if (Cache[I].InstallVer != (pkgCache::Version *)I.CurrentVer() &&
    for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
    {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);
       if (Cache[I].InstallVer != (pkgCache::Version *)I.CurrentVer() &&

-         I->SelectedState == pkgCache::State::Hold)
-        List += string(I.Name()) + " ";
+          I->SelectedState == pkgCache::State::Hold) {
+         List += string(I.Name()) + " ";
+                VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";
+      }

    }
 
    }
 

-   return ShowList(out,_("The following held packages will be changed:"),List);
+   return ShowList(out,_("The following held packages will be changed:"),List,VersionsList);

 }
                                                                        /*}}}*/
 // ShowEssential - Show an essential package warning                   /*{{{*/
 }
                                                                        /*}}}*/
 // ShowEssential - Show an essential package warning                   /*{{{*/


@@ -426,6 +491,7 @@ bool ShowHold(ostream &out,CacheFile &Cache)
 bool ShowEssential(ostream &out,CacheFile &Cache)
 {
    string List;
 bool ShowEssential(ostream &out,CacheFile &Cache)
 {
    string List;

+   string VersionsList;

    bool *Added = new bool[Cache->Head().PackageCount];
    for (unsigned int I = 0; I != Cache->Head().PackageCount; I++)
       Added[I] = false;
    bool *Added = new bool[Cache->Head().PackageCount];
    for (unsigned int I = 0; I != Cache->Head().PackageCount; I++)
       Added[I] = false;


@@ -444,6 +510,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache)
         {
            Added[I->ID] = true;
            List += string(I.Name()) + " ";
         {
            Added[I->ID] = true;
            List += string(I.Name()) + " ";

+        //VersionsList += string(Cache[I].CurVersion) + "\n"; ???

         }
       }
       
         }
       }
       


@@ -468,13 +535,14 @@ bool ShowEssential(ostream &out,CacheFile &Cache)
            char S[300];
            snprintf(S,sizeof(S),_("%s (due to %s) "),P.Name(),I.Name());
            List += S;
            char S[300];
            snprintf(S,sizeof(S),_("%s (due to %s) "),P.Name(),I.Name());
            List += S;

+        //VersionsList += "\n"; ???

         }       
       }      
    }
    
    delete [] Added;
    return ShowList(out,_("WARNING: The following essential packages will be removed\n"
         }       
       }      
    }
    
    delete [] Added;
    return ShowList(out,_("WARNING: The following essential packages will be removed\n"

-                        "This should NOT be done unless you know exactly what you are doing!"),List);
+                        "This should NOT be done unless you know exactly what you are doing!"),List,VersionsList);

 }
                                                                        /*}}}*/
 // Stats - Show some statistics                                                /*{{{*/
 }
                                                                        /*}}}*/
 // Stats - Show some statistics                                                /*{{{*/


@@ -503,7 +571,7 @@ void Stats(ostream &out,pkgDepCache &Dep)
         ReInstall++;
    }   
 
         ReInstall++;
    }   
 

-   ioprintf(out,_("%lu packages upgraded, %lu newly installed, "),
+   ioprintf(out,_("%lu upgraded, %lu newly installed, "),

            Upgrade,Install);
    
    if (ReInstall != 0)
            Upgrade,Install);
    
    if (ReInstall != 0)


@@ -511,11 +579,11 @@ void Stats(ostream &out,pkgDepCache &Dep)
    if (Downgrade != 0)
       ioprintf(out,_("%lu downgraded, "),Downgrade);
 
    if (Downgrade != 0)
       ioprintf(out,_("%lu downgraded, "),Downgrade);
 

-   ioprintf(out,_("%lu to remove and %lu  not upgraded.\n"),
+   ioprintf(out,_("%lu to remove and %lu not upgraded.\n"),

            Dep.DelCount(),Dep.KeepCount());
    
    if (Dep.BadCount() != 0)
            Dep.DelCount(),Dep.KeepCount());
    
    if (Dep.BadCount() != 0)

-      ioprintf(out,_("%lu packages not fully installed or removed.\n"),
+      ioprintf(out,_("%lu not fully installed or removed.\n"),

               Dep.BadCount());
 }
                                                                        /*}}}*/
               Dep.BadCount());
 }
                                                                        /*}}}*/


@@ -605,7 +673,7 @@ bool CacheFile::CheckDeps(bool AllowBroken)
 /* This displays the informative messages describing what is going to 
    happen and then calls the download routines */
 bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
 /* This displays the informative messages describing what is going to 
    happen and then calls the download routines */
 bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,

-                    bool Saftey = true)
+                    bool Safety = true)

 {
    if (_config->FindB("APT::Get::Purge",false) == true)
    {
 {
    if (_config->FindB("APT::Get::Purge",false) == true)
    {


@@ -626,10 +694,11 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
    if (ShwKept == true)
       ShowKept(c1out,Cache);
    Fail |= !ShowHold(c1out,Cache);
    if (ShwKept == true)
       ShowKept(c1out,Cache);
    Fail |= !ShowHold(c1out,Cache);

-   if (_config->FindB("APT::Get::Show-Upgraded",false) == true)
+   if (_config->FindB("APT::Get::Show-Upgraded",true) == true)

       ShowUpgraded(c1out,Cache);
    Fail |= !ShowDowngraded(c1out,Cache);
       ShowUpgraded(c1out,Cache);
    Fail |= !ShowDowngraded(c1out,Cache);

-   Essential = !ShowEssential(c1out,Cache);
+   if (_config->FindB("APT::Get::Download-Only",false) == false)
+        Essential = !ShowEssential(c1out,Cache);

    Fail |= Essential;
    Stats(c1out,Cache);
    
    Fail |= Essential;
    Stats(c1out,Cache);
    


@@ -702,18 +771,18 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
    
    // Number of bytes
    if (DebBytes != FetchBytes)
    
    // Number of bytes
    if (DebBytes != FetchBytes)

-      ioprintf(c1out,_("Need to get %sB/%sB of archives. "),
+      ioprintf(c1out,_("Need to get %sB/%sB of archives.\n"),

               SizeToStr(FetchBytes).c_str(),SizeToStr(DebBytes).c_str());
    else
               SizeToStr(FetchBytes).c_str(),SizeToStr(DebBytes).c_str());
    else

-      ioprintf(c1out,_("Need to get %sB of archives. "),
+      ioprintf(c1out,_("Need to get %sB of archives.\n"),

               SizeToStr(DebBytes).c_str());
 
    // Size delta
    if (Cache->UsrSize() >= 0)
               SizeToStr(DebBytes).c_str());
 
    // Size delta
    if (Cache->UsrSize() >= 0)

-      ioprintf(c1out,_("After unpacking %sB will be used.\n"),
+      ioprintf(c1out,_("After unpacking %sB of additional disk space will be used.\n"),

               SizeToStr(Cache->UsrSize()).c_str());
    else
               SizeToStr(Cache->UsrSize()).c_str());
    else

-      ioprintf(c1out,_("After unpacking %sB will be freed.\n"),
+      ioprintf(c1out,_("After unpacking %sB disk space will be freed.\n"),

               SizeToStr(-1*Cache->UsrSize()).c_str());
 
    if (_error->PendingError() == true)
               SizeToStr(-1*Cache->UsrSize()).c_str());
 
    if (_error->PendingError() == true)


@@ -721,7 +790,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
 
    /* Check for enough free space, but only if we are actually going to
       download */
 
    /* Check for enough free space, but only if we are actually going to
       download */

-   if (_config->FindB("APT::Get::Print-URIs") == false)
+   if (_config->FindB("APT::Get::Print-URIs") == false &&
+       _config->FindB("APT::Get::Download",true) == true)

    {
       struct statvfs Buf;
       string OutputDir = _config->FindDir("Dir::Cache::Archives");
    {
       struct statvfs Buf;
       string OutputDir = _config->FindDir("Dir::Cache::Archives");


@@ -729,7 +799,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
         return _error->Errno("statvfs","Couldn't determine free space in %s",
                              OutputDir.c_str());
       if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
         return _error->Errno("statvfs","Couldn't determine free space in %s",
                              OutputDir.c_str());
       if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)

-        return _error->Error(_("Sorry, you don't have enough free space in %s to hold all the .debs."),
+        return _error->Error(_("You don't have enough free space in %s."),

                              OutputDir.c_str());
    }
    
                              OutputDir.c_str());
    }
    


@@ -741,7 +811,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
         return _error->Error(_("There are problems and -y was used without --force-yes"));
    }         
 
         return _error->Error(_("There are problems and -y was used without --force-yes"));
    }         
 

-   if (Essential == true && Saftey == true)
+   if (Essential == true && Safety == true)

    {
       if (_config->FindB("APT::Get::Trivial-Only",false) == true)
         return _error->Error(_("Trivial Only specified but this is not a trivial operation."));
    {
       if (_config->FindB("APT::Get::Trivial-Only",false) == true)
         return _error->Error(_("Trivial Only specified but this is not a trivial operation."));


@@ -925,10 +995,15 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
    pkgDepCache::StateCache &State = Cache[Pkg];
    if (Remove == true && Pkg->CurrentVer == 0)
    {
    pkgDepCache::StateCache &State = Cache[Pkg];
    if (Remove == true && Pkg->CurrentVer == 0)
    {

+      Fix.Clear(Pkg);
+      Fix.Protect(Pkg);
+      Fix.Remove(Pkg);
+      

       /* We want to continue searching for regex hits, so we return false here
          otherwise this is not really an error. */
       if (AllowFail == false)
       /* We want to continue searching for regex hits, so we return false here
          otherwise this is not really an error. */
       if (AllowFail == false)

-        return false;      
+        return false;
+      

       ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.Name());
       return true;
    }
       ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.Name());
       return true;
    }


@@ -962,12 +1037,12 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
       else
       {
         ioprintf(c1out,
       else
       {
         ioprintf(c1out,

-        _("Package %s has no available version, but exists in the database.\n"
-          "This typically means that the package was mentioned in a dependency and\n"
-          "never uploaded, has been obsoleted or is not available with the contents\n"
-          "of sources.list\n"),Pkg.Name());
+        _("Package %s is not available, but is referred to by another package.\n"
+          "This may mean that the package is missing, has been obsoleted, or\n"
+           "is only available from another source\n"),Pkg.Name());

         
         string List;
         
         string List;

+        string VersionsList;

         SPtrArray<bool> Seen = new bool[Cache.Head().PackageCount];
         memset(Seen,0,Cache.Head().PackageCount*sizeof(*Seen));
         pkgCache::DepIterator Dep = Pkg.RevDependsList();
         SPtrArray<bool> Seen = new bool[Cache.Head().PackageCount];
         memset(Seen,0,Cache.Head().PackageCount*sizeof(*Seen));
         pkgCache::DepIterator Dep = Pkg.RevDependsList();


@@ -979,8 +1054,9 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
               continue;
            Seen[Dep.ParentPkg()->ID] = true;
            List += string(Dep.ParentPkg().Name()) + " ";
               continue;
            Seen[Dep.ParentPkg()->ID] = true;
            List += string(Dep.ParentPkg().Name()) + " ";

+        //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ???

         }          
         }          

-        ShowList(c1out,_("However the following packages replace it:"),List);
+        ShowList(c1out,_("However the following packages replace it:"),List,VersionsList);

       }
       
       _error->Error(_("Package %s has no installation candidate"),Pkg.Name());
       }
       
       _error->Error(_("Package %s has no installation candidate"),Pkg.Name());


@@ -1003,7 +1079,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
       if (_config->FindB("APT::Get::ReInstall",false) == true)
       {
         if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false)
       if (_config->FindB("APT::Get::ReInstall",false) == true)
       {
         if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false)

-           ioprintf(c1out,_("Sorry, re-installation of %s is not possible, it cannot be downloaded.\n"),
+           ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"),

                     Pkg.Name());
         else
            Cache.SetReInstall(Pkg,true);
                     Pkg.Name());
         else
            Cache.SetReInstall(Pkg,true);


@@ -1011,7 +1087,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
       else
       {
         if (AllowFail == true)
       else
       {
         if (AllowFail == true)

-           ioprintf(c1out,_("Sorry, %s is already the newest version.\n"),
+           ioprintf(c1out,_("%s is already the newest version.\n"),

                     Pkg.Name());
       }      
    }   
                     Pkg.Name());
       }      
    }   


@@ -1030,7 +1106,8 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
 bool TryToChangeVer(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
                    const char *VerTag,bool IsRel)
 {
 bool TryToChangeVer(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
                    const char *VerTag,bool IsRel)
 {

-   pkgVersionMatch Match(VerTag,(IsRel == true?pkgVersionMatch::Release:pkgVersionMatch::Version));
+   pkgVersionMatch Match(VerTag,(IsRel == true?pkgVersionMatch::Release : 
+                                pkgVersionMatch::Version));

    
    pkgCache::VerIterator Ver = Match.Find(Pkg);
                         
    
    pkgCache::VerIterator Ver = Match.Find(Pkg);
                         


@@ -1174,11 +1251,21 @@ bool DoUpdate(CommandLine &CmdL)
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));
    pkgAcquire Fetcher(&Stat);
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));
    pkgAcquire Fetcher(&Stat);

-   
+

    // Populate it with the source selection
    if (List.GetIndexes(&Fetcher) == false)
         return false;
    
    // Populate it with the source selection
    if (List.GetIndexes(&Fetcher) == false)
         return false;
    

+   // Just print out the uris an exit if the --print-uris flag was used
+   if (_config->FindB("APT::Get::Print-URIs") == true)
+   {
+      pkgAcquire::UriIterator I = Fetcher.UriBegin();
+      for (; I != Fetcher.UriEnd(); I++)
+        cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
+              I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl;
+      return true;
+   }
+   

    // Run it
    if (Fetcher.Run() == pkgAcquire::Failed)
       return false;
    // Run it
    if (Fetcher.Run() == pkgAcquire::Failed)
       return false;


@@ -1206,7 +1293,7 @@ bool DoUpdate(CommandLine &CmdL)
    
    // Prepare the cache.   
    CacheFile Cache;
    
    // Prepare the cache.   
    CacheFile Cache;

-   if (Cache.Open() == false)
+   if (Cache.BuildCaches() == false)

       return false;
    
    if (Failed == true)
       return false;
    
    if (Failed == true)


@@ -1274,14 +1361,14 @@ bool DoInstall(CommandLine &CmdL)
       while (Cache->FindPkg(S).end() == true)
       {
         // Handle an optional end tag indicating what to do
       while (Cache->FindPkg(S).end() == true)
       {
         // Handle an optional end tag indicating what to do

-        if (S[Length - 1] == '-')
+        if (Length >= 1 && S[Length - 1] == '-')

         {
            Remove = true;
            S[--Length] = 0;
            continue;
         }
         
         {
            Remove = true;
            S[--Length] = 0;
            continue;
         }
         

-        if (S[Length - 1] == '+')
+        if (Length >= 1 && S[Length - 1] == '+')

         {
            Remove = false;
            S[--Length] = 0;
         {
            Remove = false;
            S[--Length] = 0;


@@ -1315,7 +1402,8 @@ bool DoInstall(CommandLine &CmdL)
         // Check if the name is a regex
         const char *I;
         for (I = S; *I != 0; I++)
         // Check if the name is a regex
         const char *I;
         for (I = S; *I != 0; I++)

-           if (*I == '.' || *I == '?' || *I == '*' || *I == '|')
+           if (*I == '?' || *I == '*' || *I == '|' ||
+               *I == '[' || *I == '^' || *I == '$')

               break;
         if (*I == 0)
            return _error->Error(_("Couldn't find package %s"),S);
               break;
         if (*I == 0)
            return _error->Error(_("Couldn't find package %s"),S);


@@ -1329,7 +1417,7 @@ bool DoInstall(CommandLine &CmdL)
         if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE |
                     REG_NOSUB)) != 0)
         {
         if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE |
                     REG_NOSUB)) != 0)
         {

-           char Error[300];
+           char Error[300];        

            regerror(Res,&Pattern,Error,sizeof(Error));
            return _error->Error(_("Regex compilation error - %s"),Error);
         }
            regerror(Res,&Pattern,Error,sizeof(Error));
            return _error->Error(_("Regex compilation error - %s"),Error);
         }


@@ -1341,6 +1429,9 @@ bool DoInstall(CommandLine &CmdL)
            if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0)
               continue;
            
            if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0)
               continue;
            

+           ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"),
+                    Pkg.Name(),S);
+           

            if (VerTag != 0)
               if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
                  return false;
            if (VerTag != 0)
               if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
                  return false;


@@ -1399,7 +1490,7 @@ bool DoInstall(CommandLine &CmdL)
       c1out << _("The following information may help to resolve the situation:") << endl;
       c1out << endl;
       ShowBroken(c1out,Cache,false);
       c1out << _("The following information may help to resolve the situation:") << endl;
       c1out << endl;
       ShowBroken(c1out,Cache,false);

-      return _error->Error(_("Sorry, broken packages"));
+      return _error->Error(_("Broken packages"));

    }   
    
    /* Print out a list of packages that are going to be installed extra
    }   
    
    /* Print out a list of packages that are going to be installed extra


@@ -1407,6 +1498,7 @@ bool DoInstall(CommandLine &CmdL)
    if (Cache->InstCount() != ExpectedInst)
    {
       string List;
    if (Cache->InstCount() != ExpectedInst)
    {
       string List;

+      string VersionsList;

       for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
       {
         pkgCache::PkgIterator I(Cache,Cache.List[J]);
       for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
       {
         pkgCache::PkgIterator I(Cache,Cache.List[J]);


@@ -1418,11 +1510,86 @@ bool DoInstall(CommandLine &CmdL)
            if (strcmp(*J,I.Name()) == 0)
                break;
         
            if (strcmp(*J,I.Name()) == 0)
                break;
         

-        if (*J == 0)
+        if (*J == 0) {

            List += string(I.Name()) + " ";
            List += string(I.Name()) + " ";

+        VersionsList += string(Cache[I].CandVersion) + "\n";
+     }

       }
       
       }
       

-      ShowList(c1out,_("The following extra packages will be installed:"),List);
+      ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList);
+   }
+
+   /* Print out a list of suggested and recommended packages */
+   {
+      string SuggestsList, RecommendsList, List;
+      string SuggestsVersions, RecommendsVersions;
+      for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
+      {
+        pkgCache::PkgIterator I(Cache,Cache.List[J]);
+
+        /* Just look at the ones we want to install */
+        if ((*Cache)[I].Install() == false)
+          continue;
+
+        for (pkgCache::VerIterator V = I.VersionList(); V.end() == false; V++)
+         {
+            for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; )
+             {
+                pkgCache::DepIterator Start;
+                pkgCache::DepIterator End;
+                D.GlobOr(Start,End); // advances D
+
+                /* 
+                 * If this is a virtual package, we need to check the list of
+                 * packages that provide it and see if any of those are
+                 * installed
+                 */
+                
+                bool providedBySomething = false;
+                for (pkgCache::PrvIterator Prv = Start.TargetPkg().ProvidesList();
+                      Prv.end() != true;
+                      Prv++)
+                   if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false)
+                    {
+                      providedBySomething = true;
+                      break;
+                   }
+
+                if (providedBySomething) continue;
+            
+                 for(;;)
+                 {
+                     /* Skip if package is  installed already, or is about to be */
+                     string target = string(Start.TargetPkg().Name()) + " ";
+
+                     if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install
+                         || Cache[Start.TargetPkg()].Install())
+                       break;
+
+                     /* Skip if we already saw it */
+                     if (int(SuggestsList.find(target)) != -1 || int(RecommendsList.find(target)) != -1)
+                       break; 
+
+                    if (Start->Type == pkgCache::Dep::Suggests) {
+                      SuggestsList += target;
+                      SuggestsVersions += string(Cache[Start.TargetPkg()].CandVersion) + "\n";
+                    }
+                    
+                    if (Start->Type == pkgCache::Dep::Recommends) {
+                      RecommendsList += target;
+                      RecommendsVersions += string(Cache[Start.TargetPkg()].CandVersion) + "\n";
+                    }
+
+                     if (Start >= End)
+                        break;
+                     Start++;
+                 }
+             }
+         }
+      }
+      ShowList(c1out,_("Suggested packages:"),SuggestsList,SuggestsVersions);
+      ShowList(c1out,_("Recommended packages:"),RecommendsList,RecommendsVersions);
+

    }
 
    // See if we need to prompt
    }
 
    // See if we need to prompt


@@ -1696,7 +1863,7 @@ bool DoSource(CommandLine &CmdL)
       return _error->Errno("statvfs","Couldn't determine free space in %s",
                           OutputDir.c_str());
    if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
       return _error->Errno("statvfs","Couldn't determine free space in %s",
                           OutputDir.c_str());
    if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)

-      return _error->Error(_("Sorry, you don't have enough free space in %s"),
+      return _error->Error(_("You don't have enough free space in %s"),

                           OutputDir.c_str());
    
    // Number of bytes
                           OutputDir.c_str());
    
    // Number of bytes


@@ -1863,6 +2030,22 @@ bool DoBuildDep(CommandLine &CmdL)
       if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",false)) == false)
        return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str());
    
       if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",false)) == false)
        return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str());
    

+      // Also ensure that build-essential packages are present
+      Configuration::Item const *Opts = _config->Tree("APT::Build-Essential");
+      if (Opts) 
+        Opts = Opts->Child;
+      for (; Opts; Opts = Opts->Next)
+      {
+        if (Opts->Value.empty() == true)
+           continue;
+
+         pkgSrcRecords::Parser::BuildDepRec rec;
+        rec.Package = Opts->Value;
+        rec.Type = pkgSrcRecords::Parser::BuildDependIndep;
+        rec.Op = 0;
+        BuildDeps.push_back(rec);
+      }
+

       if (BuildDeps.size() == 0)
       {
         ioprintf(c1out,_("%s has no build depends.\n"),Src.c_str());
       if (BuildDeps.size() == 0)
       {
         ioprintf(c1out,_("%s has no build depends.\n"),Src.c_str());


@@ -1873,34 +2056,67 @@ bool DoBuildDep(CommandLine &CmdL)
       unsigned int ExpectedInst = 0;
       vector <pkgSrcRecords::Parser::BuildDepRec>::iterator D;
       pkgProblemResolver Fix(Cache);
       unsigned int ExpectedInst = 0;
       vector <pkgSrcRecords::Parser::BuildDepRec>::iterator D;
       pkgProblemResolver Fix(Cache);

+      bool skipAlternatives = false; // skip remaining alternatives in an or group

       for (D = BuildDeps.begin(); D != BuildDeps.end(); D++)
       {
       for (D = BuildDeps.begin(); D != BuildDeps.end(); D++)
       {

-        pkgCache::PkgIterator Pkg = Cache->FindPkg((*D).Package);
-        if (Pkg.end() == true)
-         {
-           /* for a build-conflict; ignore unknown packages */
-           if ((*D).Type == pkgSrcRecords::Parser::BuildConflict || 
-               (*D).Type == pkgSrcRecords::Parser::BuildConflictIndep)
-               continue;
+         bool hasAlternatives = (((*D).Op & pkgCache::Dep::Or) == pkgCache::Dep::Or);

 
 

-           return _error->Error(_("%s dependency on %s cannot be satisfied because the package %s cannot be found"),
-                                Last->BuildDepType((*D).Type),Src.c_str(),(*D).Package.c_str());
+         if (skipAlternatives == true)
+         {
+            if (!hasAlternatives)
+               skipAlternatives = false; // end of or group
+            continue;

          }
          }

-        pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache);
-        
-        if ((*D).Type == pkgSrcRecords::Parser::BuildConflict || 
+
+         if ((*D).Type == pkgSrcRecords::Parser::BuildConflict ||

             (*D).Type == pkgSrcRecords::Parser::BuildConflictIndep)
             (*D).Type == pkgSrcRecords::Parser::BuildConflictIndep)

-        {
-           /* 
-            * conflict; need to remove if we have an installed version 
-            * that satisfies the version criterial 
-            */
-           if (IV.end() == false && 
-               Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == true)
-              TryToInstall(Pkg,Cache,Fix,true,false,ExpectedInst);
-        } 
-        else 
-        {
+         {
+            pkgCache::PkgIterator Pkg = Cache->FindPkg((*D).Package);
+            // Build-conflicts on unknown packages are silently ignored
+            if (Pkg.end() == true)
+               continue;
+
+            pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache);
+
+            /* 
+             * Remove if we have an installed version that satisfies the 
+             * version criteria
+             */
+            if (IV.end() == false && 
+                Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == true)
+               TryToInstall(Pkg,Cache,Fix,true,false,ExpectedInst);
+         }
+        else // BuildDep || BuildDepIndep
+         {
+           pkgCache::PkgIterator Pkg = Cache->FindPkg((*D).Package);
+            if (_config->FindB("Debug::BuildDeps",false) == true)
+                 cout << "Looking for " << (*D).Package << "...\n";
+
+           if (Pkg.end() == true)
+            {
+               if (_config->FindB("Debug::BuildDeps",false) == true)
+                    cout << " (not found)" << (*D).Package << endl;
+
+               if (hasAlternatives)
+                  continue;
+
+               return _error->Error(_("%s dependency for %s cannot be satisfied "
+                                      "because the package %s cannot be found"),
+                                    Last->BuildDepType((*D).Type),Src.c_str(),
+                                    (*D).Package.c_str());
+            }
+
+            /*
+             * if there are alternatives, we've already picked one, so skip
+             * the rest
+             *
+             * TODO: this means that if there's a build-dep on A|B and B is
+             * installed, we'll still try to install A; more importantly,
+             * if A is currently broken, we cannot go back and try B. To fix 
+             * this would require we do a Resolve cycle for each package we 
+             * add to the install list. Ugh
+             */
+                       

            /* 
             * If this is a virtual package, we need to check the list of
             * packages that provide it and see if any of those are
            /* 
             * If this is a virtual package, we need to check the list of
             * packages that provide it and see if any of those are


@@ -1908,24 +2124,99 @@ bool DoBuildDep(CommandLine &CmdL)
             */
             pkgCache::PrvIterator Prv = Pkg.ProvidesList();
             for (; Prv.end() != true; Prv++)
             */
             pkgCache::PrvIterator Prv = Pkg.ProvidesList();
             for (; Prv.end() != true; Prv++)

+           {
+               if (_config->FindB("Debug::BuildDeps",false) == true)
+                    cout << "  Checking provider " << Prv.OwnerPkg().Name() << endl;
+

               if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false)
                  break;
               if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false)
                  break;

-
-           if (Prv.end() == true)
-           {
-              /* 
-               * depends; need to install or upgrade if we don't have the
-               * package installed or if the version does not satisfy the
-               * build dep. This is complicated by the fact that if we
-               * depend on a version lower than what we already have 
-               * installed it is not clear what should be done; in practice
-               * this case should be rare though and right now nothing
-               * is done about it :-( 
-               */
-              if (IV.end() == true ||
-                 Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == false)
-                    TryToInstall(Pkg,Cache,Fix,false,false,ExpectedInst);
-           }
+            }
+            
+            // Get installed version and version we are going to install
+           pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache);
+
+            if ((*D).Version[0] != '\0') {
+                 // Versioned dependency
+
+                 pkgCache::VerIterator CV = (*Cache)[Pkg].CandidateVerIter(*Cache);
+
+                 for (; CV.end() != true; CV++)
+                 {
+                      if (Cache->VS().CheckDep(CV.VerStr(),(*D).Op,(*D).Version.c_str()) == true)
+                           break;
+                 }
+                 if (CV.end() == true)
+                  if (hasAlternatives)
+                  {
+                     continue;
+                  }
+                  else
+                  {
+                      return _error->Error(_("%s dependency for %s cannot be satisfied "
+                                             "because no available versions of package %s "
+                                             "can satisfy version requirements"),
+                                           Last->BuildDepType((*D).Type),Src.c_str(),
+                                           (*D).Package.c_str());
+                  }
+            }
+            else
+            {
+               // Only consider virtual packages if there is no versioned dependency
+               if (Prv.end() == false)
+               {
+                  if (_config->FindB("Debug::BuildDeps",false) == true)
+                     cout << "  Is provided by installed package " << Prv.OwnerPkg().Name() << endl;
+                  skipAlternatives = hasAlternatives;
+                  continue;
+               }
+            }
+
+            if (IV.end() == false)
+            {
+               if (_config->FindB("Debug::BuildDeps",false) == true)
+                  cout << "  Is installed\n";
+
+               if (Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == true)
+               {
+                  skipAlternatives = hasAlternatives;
+                  continue;
+               }
+
+               if (_config->FindB("Debug::BuildDeps",false) == true)
+                  cout << "    ...but the installed version doesn't meet the version requirement\n";
+
+               if (((*D).Op & pkgCache::Dep::LessEq) == pkgCache::Dep::LessEq)
+               {
+                  return _error->Error(_("Failed to satisfy %s dependency for %s: Installed package %s is too new"),
+                                       Last->BuildDepType((*D).Type),
+                                       Src.c_str(),
+                                       Pkg.Name());
+               }
+            }
+
+
+            if (_config->FindB("Debug::BuildDeps",false) == true)
+               cout << "  Trying to install " << (*D).Package << endl;
+
+            if (TryToInstall(Pkg,Cache,Fix,false,false,ExpectedInst) == true)
+            {
+               // We successfully installed something; skip remaining alternatives
+               skipAlternatives = hasAlternatives;
+               continue;
+            }
+            else if (hasAlternatives)
+            {
+               if (_config->FindB("Debug::BuildDeps",false) == true)
+                  cout << "  Unsatisfiable, trying alternatives\n";
+               continue;
+            }
+            else
+            {
+               return _error->Error(_("Failed to satisfy %s dependency for %s: %s"),
+                                    Last->BuildDepType((*D).Type),
+                                    Src.c_str(),
+                                    (*D).Package.c_str());
+            }

         }             
       }
       
         }             
       }
       


@@ -1935,8 +2226,7 @@ bool DoBuildDep(CommandLine &CmdL)
       
       // Now we check the state of the packages,
       if (Cache->BrokenCount() != 0)
       
       // Now we check the state of the packages,
       if (Cache->BrokenCount() != 0)

-        return _error->Error(_("Some broken packages were found while trying to process build-dependencies.\n"
-                               "You might want to run `apt-get -f install' to correct these."));
+         return _error->Error(_("Build-dependencies for %s could not be satisfied."),*I);

    }
   
    if (InstallPackages(Cache, false, true) == false)
    }
   
    if (InstallPackages(Cache, false, true) == false)


@@ -2045,6 +2335,7 @@ bool ShowHelp(CommandLine &CmdL)
       "  -m  Attempt to continue if archives are unlocatable\n"
       "  -u  Show a list of upgraded packages as well\n"
       "  -b  Build the source package after fetching it\n"
       "  -m  Attempt to continue if archives are unlocatable\n"
       "  -u  Show a list of upgraded packages as well\n"
       "  -b  Build the source package after fetching it\n"

+      "  -V  Show verbose version numbers\n"

       "  -c=? Read this configuration file\n"
       "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
       "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
       "  -c=? Read this configuration file\n"
       "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
       "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"


@@ -2065,7 +2356,7 @@ void GetInitialize()
    _config->Set("APT::Get::Assume-Yes",false);
    _config->Set("APT::Get::Fix-Broken",false);
    _config->Set("APT::Get::Force-Yes",false);
    _config->Set("APT::Get::Assume-Yes",false);
    _config->Set("APT::Get::Fix-Broken",false);
    _config->Set("APT::Get::Force-Yes",false);

-   _config->Set("APT::Get::APT::Get::No-List-Cleanup",true);
+   _config->Set("APT::Get::List-Cleanup",true);

 }
                                                                        /*}}}*/
 // SigWinch - Window size change signal handler                                /*{{{*/
 }
                                                                        /*}}}*/
 // SigWinch - Window size change signal handler                                /*{{{*/


@@ -2088,6 +2379,7 @@ int main(int argc,const char *argv[])
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
       {'v',"version","version",0},
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
       {'v',"version","version",0},

+      {'V',"verbose-versions","APT::Get::Show-Versions",0},

       {'q',"quiet","quiet",CommandLine::IntLevel},
       {'q',"silent","quiet",CommandLine::IntLevel},
       {'d',"download-only","APT::Get::Download-Only",0},
       {'q',"quiet","quiet",CommandLine::IntLevel},
       {'q',"silent","quiet",CommandLine::IntLevel},
       {'d',"download-only","APT::Get::Download-Only",0},


@@ -2133,11 +2425,15 @@ int main(int argc,const char *argv[])
                                    {"clean",&DoClean},
                                    {"autoclean",&DoAutoClean},
                                    {"check",&DoCheck},
                                    {"clean",&DoClean},
                                    {"autoclean",&DoAutoClean},
                                    {"check",&DoCheck},

-                                  {"source",&DoSource},
+                                  {"source",&DoSource},

                                   {"moo",&DoMoo},
                                   {"moo",&DoMoo},

-                                  {"help",&ShowHelp},
+                                  {"help",&ShowHelp},

                                    {0,0}};
                                    {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 ||


@@ -2161,7 +2457,7 @@ int main(int argc,const char *argv[])
    }
    
    // Deal with stdout not being a tty
    }
    
    // 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");
 
    // Setup the output streams
       _config->Set("quiet","1");
 
    // Setup the output streams