merged from davids branch

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index c8c733716774923a92cf8730f247b865f1f7dfe4..26c731978bc442aae4fbd9cbde5ea03f4817b318 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -227,17 +227,6 @@ bool ShowList(ostream &out,string Title,string List,string VersionsList)
    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

-// ShowPkg - display a package name                                    /*{{{*/
-// ---------------------------------------------------------------------
-/* Displays the package name and maybe also the architecture
-   if it is not the main architecture */
-string ShowPkg(pkgCache::PkgIterator const Pkg) {
-       string p = Pkg.Name();
-       if (strcmp(Pkg.Arch(),"all") != 0 && _config->Find("APT::Architecture") != Pkg.Arch())
-               p.append(":").append(Pkg.Arch());
-       return p;
-}
-                                                                       /*}}}*/

 // ShowBroken - Debugging aide                                         /*{{{*/
 // ---------------------------------------------------------------------
 /* This prints out the names of all the packages that are broken along
 // ShowBroken - Debugging aide                                         /*{{{*/
 // ---------------------------------------------------------------------
 /* This prints out the names of all the packages that are broken along


@@ -269,8 +258,8 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now)
       }
       
       // Print out each package and the failed dependencies
       }
       
       // Print out each package and the failed dependencies

-      out << " " << ShowPkg(I) << " :";
-      unsigned const Indent = ShowPkg(I).size() + 3;
+      out << " " << I.FullName(true) << " :";
+      unsigned const Indent = I.FullName(true).size() + 3;

       bool First = true;
       pkgCache::VerIterator Ver;
       
       bool First = true;
       pkgCache::VerIterator Ver;
       


@@ -323,7 +312,7 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now)
               out << ' ' << End.DepType() << ": ";
            FirstOr = false;
            
               out << ' ' << End.DepType() << ": ";
            FirstOr = false;
            

-           out << ShowPkg(Start.TargetPkg());
+           out << Start.TargetPkg().FullName(true);

         
            // Show a quick summary of the version requirements
            if (Start.TargetVer() != 0)
         
            // Show a quick summary of the version requirements
            if (Start.TargetVer() != 0)


@@ -387,7 +376,7 @@ void ShowNew(ostream &out,CacheFile &Cache)
       if (Cache[I].NewInstall() == true) {
         if (Cache[I].CandidateVerIter(Cache).Pseudo() == true)
            continue;
       if (Cache[I].NewInstall() == true) {
         if (Cache[I].CandidateVerIter(Cache).Pseudo() == true)
            continue;

-         List += ShowPkg(I) + " ";
+         List += I.FullName(true) + " ";

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


@@ -412,9 +401,9 @@ void ShowDel(ostream &out,CacheFile &Cache)
         if (Cache[I].CandidateVerIter(Cache).Pseudo() == true)
            continue;
         if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge)
         if (Cache[I].CandidateVerIter(Cache).Pseudo() == true)
            continue;
         if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge)

-           List += ShowPkg(I) + "* ";
+           List += I.FullName(true) + "* ";

         else
         else

-           List += ShowPkg(I) + " ";
+           List += I.FullName(true) + " ";

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


@@ -439,7 +428,7 @@ void ShowKept(ostream &out,CacheFile &Cache)
          I->CurrentVer == 0 || Cache[I].Delete() == true)
         continue;
       
          I->CurrentVer == 0 || Cache[I].Delete() == true)
         continue;
       

-      List += ShowPkg(I) + " ";
+      List += I.FullName(true) + " ";

       VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";
    }
    ShowList(out,_("The following packages have been kept back:"),List,VersionsList);
       VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";
    }
    ShowList(out,_("The following packages have been kept back:"),List,VersionsList);


@@ -462,7 +451,7 @@ void ShowUpgraded(ostream &out,CacheFile &Cache)
       if (Cache[I].CandidateVerIter(Cache).Pseudo() == true)
         continue;
 
       if (Cache[I].CandidateVerIter(Cache).Pseudo() == true)
         continue;
 

-      List += ShowPkg(I) + " ";
+      List += I.FullName(true) + " ";

       VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";
    }
    ShowList(out,_("The following packages will be upgraded:"),List,VersionsList);
       VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";
    }
    ShowList(out,_("The following packages will be upgraded:"),List,VersionsList);


@@ -485,7 +474,7 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache)
       if (Cache[I].CandidateVerIter(Cache).Pseudo() == true)
         continue;
 
       if (Cache[I].CandidateVerIter(Cache).Pseudo() == true)
         continue;
 

-      List += ShowPkg(I) + " ";
+      List += I.FullName(true) + " ";

       VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";
    }
    return ShowList(out,_("The following packages will be DOWNGRADED:"),List,VersionsList);
       VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n";
    }
    return ShowList(out,_("The following packages will be DOWNGRADED:"),List,VersionsList);


@@ -503,7 +492,7 @@ bool ShowHold(ostream &out,CacheFile &Cache)
       pkgCache::PkgIterator I(Cache,Cache.List[J]);
       if (Cache[I].InstallVer != (pkgCache::Version *)I.CurrentVer() &&
           I->SelectedState == pkgCache::State::Hold) {
       pkgCache::PkgIterator I(Cache,Cache.List[J]);
       if (Cache[I].InstallVer != (pkgCache::Version *)I.CurrentVer() &&
           I->SelectedState == pkgCache::State::Hold) {

-         List += ShowPkg(I) + " ";
+         List += I.FullName(true) + " ";

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


@@ -537,7 +526,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache)
         if (Added[I->ID] == false)
         {
            Added[I->ID] = true;
         if (Added[I->ID] == false)
         {
            Added[I->ID] = true;

-           List += ShowPkg(I) + " ";
+           List += I.FullName(true) + " ";

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


@@ -561,7 +550,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache)
            Added[P->ID] = true;
            
            char S[300];
            Added[P->ID] = true;
            
            char S[300];

-           snprintf(S,sizeof(S),_("%s (due to %s) "),P.Name(),I.Name());
+           snprintf(S,sizeof(S),_("%s (due to %s) "),P.FullName(true).c_str(),I.FullName(true).c_str());

            List += S;
         //VersionsList += "\n"; ???
         }       
            List += S;
         //VersionsList += "\n"; ???
         }       


@@ -703,7 +692,7 @@ bool CacheFile::CheckDeps(bool AllowBroken)
    }
    else
    {
    }
    else
    {

-      c1out << _("You might want to run `apt-get -f install' to correct these.") << endl;
+      c1out << _("You might want to run 'apt-get -f install' to correct these.") << endl;

       ShowBroken(c1out,*this,true);
 
       return _error->Error(_("Unmet dependencies. Try using -f."));
       ShowBroken(c1out,*this,true);
 
       return _error->Error(_("Unmet dependencies. Try using -f."));


@@ -822,20 +811,19 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
    pkgRecords Recs(Cache);
    if (_error->PendingError() == true)
       return false;
    pkgRecords Recs(Cache);
    if (_error->PendingError() == true)
       return false;

-   
-   // Lock the archive directory
-   FileFd Lock;
-   if (_config->FindB("Debug::NoLocking",false) == false &&
-       _config->FindB("APT::Get::Print-URIs") == false)
-   {
-      Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
-      if (_error->PendingError() == true)
-        return _error->Error(_("Unable to lock the download directory"));
-   }
-   
+

    // Create the download object
    // Create the download object

+   pkgAcquire Fetcher;

    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   

-   pkgAcquire Fetcher(&Stat);
+   if (_config->FindB("APT::Get::Print-URIs", false) == true)
+   {
+      // force a hashsum for compatibility reasons
+      _config->CndSet("Acquire::ForceHash", "md5sum");
+      if (Fetcher.Setup(&Stat, "") == false)
+        return false;
+   }
+   else if (Fetcher.Setup(&Stat, _config->FindDir("Dir::Cache::Archives")) == false)
+      return false;

 
    // Read the source list
    pkgSourceList List;
 
    // Read the source list
    pkgSourceList List;


@@ -1106,7 +1094,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
       if (found_one == true)
       {
         ioprintf(c1out,_("Note, selecting %s instead of %s\n"),
       if (found_one == true)
       {
         ioprintf(c1out,_("Note, selecting %s instead of %s\n"),

-                 Prov.Name(),Pkg.Name());
+                 Prov.FullName(true).c_str(),Pkg.FullName(true).c_str());

         Pkg = Prov;
       }
    }
         Pkg = Prov;
       }
    }


@@ -1117,10 +1105,20 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
    {
       if (AllowFail == true)
         ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"),
    {
       if (AllowFail == true)
         ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"),

+                 Pkg.FullName(true).c_str());
+      return true;
+   }
+
+   // Ignore request for install if package would be new
+   if (_config->FindB("APT::Get::Only-Upgrade", false) == true &&
+       Pkg->CurrentVer == 0)
+   {
+      if (AllowFail == true)
+        ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"),

                  Pkg.Name());
       return true;
    }
                  Pkg.Name());
       return true;
    }

-   
+

    // Check if there is something at all to install
    pkgDepCache::StateCache &State = Cache[Pkg];
    if (Remove == true && Pkg->CurrentVer == 0)
    // Check if there is something at all to install
    pkgDepCache::StateCache &State = Cache[Pkg];
    if (Remove == true && Pkg->CurrentVer == 0)


@@ -1134,7 +1132,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
       if (AllowFail == false)
         return false;
       
       if (AllowFail == false)
         return false;
       

-      ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.Name());
+      ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str());

       return true;
    }
    
       return true;
    }
    


@@ -1146,30 +1144,37 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
       if (Pkg->ProvidesList != 0)
       {
         ioprintf(c1out,_("Package %s is a virtual package provided by:\n"),
       if (Pkg->ProvidesList != 0)
       {
         ioprintf(c1out,_("Package %s is a virtual package provided by:\n"),

-                 Pkg.Name());
+                 Pkg.FullName(true).c_str());

         
         pkgCache::PrvIterator I = Pkg.ProvidesList();
         
         pkgCache::PrvIterator I = Pkg.ProvidesList();

+        unsigned short provider = 0;

         for (; I.end() == false; I++)
         {
            pkgCache::PkgIterator Pkg = I.OwnerPkg();
            
            if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer())
            {
         for (; I.end() == false; I++)
         {
            pkgCache::PkgIterator Pkg = I.OwnerPkg();
            
            if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer())
            {

+              c1out << "  " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr();

               if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false)
               if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false)

-                 c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() <<
-                 _(" [Installed]") << endl;
-              else
-                 c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() << endl;
-           }      
+                 c1out << _(" [Installed]");
+              c1out << endl;
+              ++provider;
+           }

         }
         }

-        c1out << _("You should explicitly select one to install.") << endl;
+        // if we found no candidate which provide this package, show non-candidates
+        if (provider == 0)
+           for (I = Pkg.ProvidesList(); I.end() == false; I++)
+              c1out << "  " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr()
+               << _(" [Not candidate version]") << endl;
+        else
+           c1out << _("You should explicitly select one to install.") << endl;

       }
       else
       {
         ioprintf(c1out,
         _("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"
       }
       else
       {
         ioprintf(c1out,
         _("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());
+           "is only available from another source\n"),Pkg.FullName(true).c_str());

         
         string List;
         string VersionsList;
         
         string List;
         string VersionsList;


@@ -1183,13 +1188,13 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
            if (Seen[Dep.ParentPkg()->ID] == true)
               continue;
            Seen[Dep.ParentPkg()->ID] = true;
            if (Seen[Dep.ParentPkg()->ID] == true)
               continue;
            Seen[Dep.ParentPkg()->ID] = true;

-           List += string(Dep.ParentPkg().Name()) + " ";
+           List += Dep.ParentPkg().FullName(true) + " ";

         //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ???
         }          
         ShowList(c1out,_("However the following packages replace it:"),List,VersionsList);
       }
       
         //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ???
         }          
         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.FullName(true).c_str());

       return false;
    }
 
       return false;
    }
 


@@ -1210,7 +1215,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
       {
         if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false)
            ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"),
       {
         if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false)
            ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"),

-                    Pkg.Name());
+                    Pkg.FullName(true).c_str());

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


@@ -1218,7 +1223,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
       {
         if (AllowFail == true)
            ioprintf(c1out,_("%s is already the newest version.\n"),
       {
         if (AllowFail == true)
            ioprintf(c1out,_("%s is already the newest version.\n"),

-                    Pkg.Name());
+                    Pkg.FullName(true).c_str());

       }      
    }   
    else
       }      
    }   
    else


@@ -1247,18 +1252,23 @@ bool TryToChangeVer(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
    {
       if (IsRel == true)
         return _error->Error(_("Release '%s' for '%s' was not found"),
    {
       if (IsRel == true)
         return _error->Error(_("Release '%s' for '%s' was not found"),

-                             VerTag,Pkg.Name());
+                             VerTag,Pkg.FullName(true).c_str());

       return _error->Error(_("Version '%s' for '%s' was not found"),
       return _error->Error(_("Version '%s' for '%s' was not found"),

-                          VerTag,Pkg.Name());
+                          VerTag,Pkg.FullName(true).c_str());

    }
    
    if (strcmp(VerTag,Ver.VerStr()) != 0)
    {
       ioprintf(c1out,_("Selected version %s (%s) for %s\n"),
    }
    
    if (strcmp(VerTag,Ver.VerStr()) != 0)
    {
       ioprintf(c1out,_("Selected version %s (%s) for %s\n"),

-              Ver.VerStr(),Ver.RelStr().c_str(),Pkg.Name());
+              Ver.VerStr(),Ver.RelStr().c_str(),Pkg.FullName(true).c_str());

    }
    
    Cache.SetCandidateVersion(Ver);
    }
    
    Cache.SetCandidateVersion(Ver);

+
+   // Set the all package to the same candidate
+   if (Ver.Pseudo() == true)
+      Cache.SetCandidateVersion(Match.Find(Pkg.Group().FindPkg("all")));
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -1292,12 +1302,30 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
    {
       if(VerTag.empty() == false || DefRel.empty() == false) 
       {
    {
       if(VerTag.empty() == false || DefRel.empty() == false) 
       {

+        bool fuzzy = false;

         // we have a default release, try to locate the pkg. we do it like
         // this because GetCandidateVer() will not "downgrade", that means
         // "apt-get source -t stable apt" won't work on a unstable system
         // we have a default release, try to locate the pkg. we do it like
         // this because GetCandidateVer() will not "downgrade", that means
         // "apt-get source -t stable apt" won't work on a unstable system

-        for (pkgCache::VerIterator Ver = Pkg.VersionList();
-             Ver.end() == false; Ver++) 
+        for (pkgCache::VerIterator Ver = Pkg.VersionList();; Ver++)

         {
         {

+           // try first only exact matches, later fuzzy matches
+           if (Ver.end() == true)
+           {
+              if (fuzzy == true)
+                 break;
+              fuzzy = true;
+              Ver = Pkg.VersionList();
+              // exit right away from the Pkg.VersionList() loop if we
+              // don't have any versions
+              if (Ver.end() == true)
+                 break;
+           }
+           // We match against a concrete version (or a part of this version)
+           if (VerTag.empty() == false &&
+               (fuzzy == true || Cache.VS().CmpVersion(VerTag, Ver.VerStr()) != 0) && // exact match
+               (fuzzy == false || strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)) // fuzzy match
+              continue;
+

            for (pkgCache::VerFileIterator VF = Ver.FileList();
                 VF.end() == false; VF++) 
            {
            for (pkgCache::VerFileIterator VF = Ver.FileList();
                 VF.end() == false; VF++) 
            {


@@ -1310,10 +1338,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
                   pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
                  continue;
 
                   pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
                  continue;
 

-              // We match against a concrete version (or a part of this version)
-              if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)
-                 continue;
-

               // or we match against a release
               if(VerTag.empty() == false ||
                  (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) ||
               // or we match against a release
               if(VerTag.empty() == false ||
                  (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) ||


@@ -1324,10 +1348,9 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
                  // no SourcePkg name, so it is the "binary" name
                  if (Src.empty() == true)
                     Src = TmpSrc;
                  // no SourcePkg name, so it is the "binary" name
                  if (Src.empty() == true)
                     Src = TmpSrc;

-                 // no Version, so we try the Version of the SourcePkg -
-                 // and after that the version of the binary package
-                 if (VerTag.empty() == true)
-                    VerTag = Parse.SourceVer();
+                 // the Version we have is possibly fuzzy or includes binUploads,
+                 // so we use the Version of the SourcePkg (empty if same as package)
+                 VerTag = Parse.SourceVer();

                  if (VerTag.empty() == true)
                     VerTag = Ver.VerStr();
                  break;
                  if (VerTag.empty() == true)
                     VerTag = Ver.VerStr();
                  break;


@@ -1339,9 +1362,11 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
         if (Src.empty() == true) 
         {
            // Sources files have no codename information
         if (Src.empty() == true) 
         {
            // Sources files have no codename information

-           if (VerTag.empty() == true && DefRel.empty() == false)
-              _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
-           DefRel.clear();
+           if (VerTag.empty() == true && DefRel.empty() == false) 
+           {
+              _error->Error(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
+              return 0;
+           }

         }
       }
       if (Src.empty() == true)
         }
       }
       if (Src.empty() == true)


@@ -1391,7 +1416,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
         const string Ver = Parse->Version();
 
         // Ignore all versions which doesn't fit
         const string Ver = Parse->Version();
 
         // Ignore all versions which doesn't fit

-        if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0)
+        if (VerTag.empty() == false &&
+            Cache.VS().CmpVersion(VerTag, Ver) != 0) // exact match

            continue;
 
         // Newer version or an exact match? Save the hit
            continue;
 
         // Newer version or an exact match? Save the hit


@@ -1408,8 +1434,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
       if (Last != 0 || VerTag.empty() == true)
         break;
       //if (VerTag.empty() == false && Last == 0)
       if (Last != 0 || VerTag.empty() == true)
         break;
       //if (VerTag.empty() == false && Last == 0)

-      _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
-      VerTag.clear();
+      _error->Error(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+      return 0;

    }
 
    if (Last == 0 || Last->Jump(Offset) == false)
    }
 
    if (Last == 0 || Last->Jump(Offset) == false)


@@ -1431,23 +1457,19 @@ bool DoUpdate(CommandLine &CmdL)
    if (List.ReadMainList() == false)
       return false;
 
    if (List.ReadMainList() == false)
       return false;
 

-   // Lock the list directory
-   FileFd Lock;
-   if (_config->FindB("Debug::NoLocking",false) == false)
-   {
-      Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
-      if (_error->PendingError() == true)
-        return _error->Error(_("Unable to lock the list directory"));
-   }
-   

    // Create the progress
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));
       
    // Just print out the uris an exit if the --print-uris flag was used
    if (_config->FindB("APT::Get::Print-URIs") == true)
    {
    // Create the progress
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));
       
    // Just print out the uris an exit if the --print-uris flag was used
    if (_config->FindB("APT::Get::Print-URIs") == true)
    {

+      // force a hashsum for compatibility reasons
+      _config->CndSet("Acquire::ForceHash", "md5sum");
+

       // get a fetcher
       // get a fetcher

-      pkgAcquire Fetcher(&Stat);
+      pkgAcquire Fetcher;
+      if (Fetcher.Setup(&Stat) == false)
+        return false;

 
       // Populate it with the source selection and get all Indexes 
       // (GetAll=true)
 
       // Populate it with the source selection and get all Indexes 
       // (GetAll=true)


@@ -1511,7 +1533,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
       {
         if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install())
            if(Debug)
       {
         if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install())
            if(Debug)

-              std::cout << "We could delete %s" <<  Pkg.Name() << std::endl;
+              std::cout << "We could delete %s" <<  Pkg.FullName(true).c_str() << std::endl;

 
         if (doAutoRemove)
         {
 
         if (doAutoRemove)
         {


@@ -1530,7 +1552,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
               // we don't need to fill the strings if we don't need them
               if (smallList == false)
               {
               // we don't need to fill the strings if we don't need them
               if (smallList == false)
               {

-                autoremovelist += string(Pkg.Name()) + " ";
+                autoremovelist += Pkg.FullName(true) + " ";

                 autoremoveversions += string(Cache[Pkg].CandVersion) + "\n";
               }
            }
                 autoremoveversions += string(Cache[Pkg].CandVersion) + "\n";
               }
            }


@@ -1766,11 +1788,14 @@ bool DoInstall(CommandLine &CmdL)
         
            // Run over the matches
            bool Hit = false;
         
            // Run over the matches
            bool Hit = false;

-           for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++)
+           for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp)

            {
            {

-              if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0)
+              if (regexec(&Pattern,Grp.Name(),0,0,0) != 0)

                  continue;
                  continue;

-           
+              Pkg = Grp.FindPkg("native");
+              if (unlikely(Pkg.end() == true))
+                 continue;
+

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


@@ -1801,10 +1826,11 @@ bool DoInstall(CommandLine &CmdL)
               Cache[Pkg].Install() == false && 
               (Cache[Pkg].Flags & pkgCache::Flag::Auto) &&
               _config->FindB("APT::Get::ReInstall",false) == false &&
               Cache[Pkg].Install() == false && 
               (Cache[Pkg].Flags & pkgCache::Flag::Auto) &&
               _config->FindB("APT::Get::ReInstall",false) == false &&

+              _config->FindB("APT::Get::Only-Upgrade",false) == false &&

               _config->FindB("APT::Get::Download-Only",false) == false)
            {
               ioprintf(c1out,_("%s set to manually installed.\n"),
               _config->FindB("APT::Get::Download-Only",false) == false)
            {
               ioprintf(c1out,_("%s set to manually installed.\n"),

-                       Pkg.Name());
+                       Pkg.FullName(true).c_str());

               Cache->MarkAuto(Pkg,false);
               AutoMarkChanged++;
            }
               Cache->MarkAuto(Pkg,false);
               AutoMarkChanged++;
            }


@@ -1816,7 +1842,7 @@ bool DoInstall(CommandLine &CmdL)
         packages */
       if (BrokenFix == true && Cache->BrokenCount() != 0)
       {
         packages */
       if (BrokenFix == true && Cache->BrokenCount() != 0)
       {

-        c1out << _("You might want to run `apt-get -f install' to correct these:") << endl;
+        c1out << _("You might want to run 'apt-get -f install' to correct these:") << endl;

         ShowBroken(c1out,Cache,false);
 
         return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."));
         ShowBroken(c1out,Cache,false);
 
         return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."));


@@ -1873,7 +1899,7 @@ bool DoInstall(CommandLine &CmdL)
                break;
         
         if (*J == 0) {
                break;
         
         if (*J == 0) {

-           List += string(I.Name()) + " ";
+           List += I.FullName(true) + " ";

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


@@ -1909,7 +1935,7 @@ bool DoInstall(CommandLine &CmdL)
            for(;;)
            {
               /* Skip if package is  installed already, or is about to be */
            for(;;)
            {
               /* Skip if package is  installed already, or is about to be */

-              string target = string(Start.TargetPkg().Name()) + " ";
+              string target = Start.TargetPkg().FullName(true) + " ";

               
               if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install
                   || Cache[Start.TargetPkg()].Install())
               
               if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install
                   || Cache[Start.TargetPkg()].Install())


@@ -2195,7 +2221,9 @@ bool DoSource(CommandLine &CmdL)
 
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   
 
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   

-   pkgAcquire Fetcher(&Stat);
+   pkgAcquire Fetcher;
+   if (Fetcher.Setup(&Stat) == false)
+      return false;

 
    DscFile *Dsc = new DscFile[CmdL.FileSize()];
    
 
    DscFile *Dsc = new DscFile[CmdL.FileSize()];
    


@@ -2310,6 +2338,7 @@ bool DoSource(CommandLine &CmdL)
    {
       for (unsigned I = 0; I != J; I++)
         ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str());
    {
       for (unsigned I = 0; I != J; I++)
         ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str());

+      delete[] Dsc;

       return true;
    }
    
       return true;
    }
    


@@ -2320,6 +2349,7 @@ bool DoSource(CommandLine &CmdL)
       for (; I != Fetcher.UriEnd(); I++)
         cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
               I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;
       for (; I != Fetcher.UriEnd(); I++)
         cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
               I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;

+      delete[] Dsc;

       return true;
    }
    
       return true;
    }
    


@@ -2345,6 +2375,7 @@ bool DoSource(CommandLine &CmdL)
    if (_config->FindB("APT::Get::Download-only",false) == true)
    {
       c1out << _("Download complete and in download only mode") << endl;
    if (_config->FindB("APT::Get::Download-only",false) == true)
    {
       c1out << _("Download complete and in download only mode") << endl;

+      delete[] Dsc;

       return true;
    }
 
       return true;
    }
 


@@ -2406,7 +2437,8 @@ bool DoSource(CommandLine &CmdL)
       
       _exit(0);
    }
       
       _exit(0);
    }

-   
+   delete[] Dsc;
+

    // Wait for the subprocess
    int Status = 0;
    while (waitpid(Process,&Status,0) != Process)
    // Wait for the subprocess
    int Status = 0;
    while (waitpid(Process,&Status,0) != Process)


@@ -2448,7 +2480,9 @@ bool DoBuildDep(CommandLine &CmdL)
 
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   
 
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   

-   pkgAcquire Fetcher(&Stat);
+   pkgAcquire Fetcher;
+   if (Fetcher.Setup(&Stat) == false)
+      return false;

 
    unsigned J = 0;
    for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++)
 
    unsigned J = 0;
    for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++)


@@ -2559,7 +2593,7 @@ bool DoBuildDep(CommandLine &CmdL)
             for (; Prv.end() != true; Prv++)
            {
                if (_config->FindB("Debug::BuildDeps",false) == true)
             for (; Prv.end() != true; Prv++)
            {
                if (_config->FindB("Debug::BuildDeps",false) == true)

-                    cout << "  Checking provider " << Prv.OwnerPkg().Name() << endl;
+                    cout << "  Checking provider " << Prv.OwnerPkg().FullName() << endl;

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


@@ -2600,7 +2634,7 @@ bool DoBuildDep(CommandLine &CmdL)
                if (Prv.end() == false)
                {
                   if (_config->FindB("Debug::BuildDeps",false) == true)
                if (Prv.end() == false)
                {
                   if (_config->FindB("Debug::BuildDeps",false) == true)

-                     cout << "  Is provided by installed package " << Prv.OwnerPkg().Name() << endl;
+                     cout << "  Is provided by installed package " << Prv.OwnerPkg().FullName() << endl;

                   skipAlternatives = hasAlternatives;
                   continue;
                }
                   skipAlternatives = hasAlternatives;
                   continue;
                }


@@ -2625,7 +2659,7 @@ bool DoBuildDep(CommandLine &CmdL)
                   return _error->Error(_("Failed to satisfy %s dependency for %s: Installed package %s is too new"),
                                        Last->BuildDepType((*D).Type),
                                        Src.c_str(),
                   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());
+                                       Pkg.FullName(true).c_str());

                }
             }
 
                }
             }
 


@@ -2674,7 +2708,6 @@ bool DoBuildDep(CommandLine &CmdL)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-

 // DoMoo - Never Ask, Never Tell                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // DoMoo - Never Ask, Never Tell                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -2843,6 +2876,7 @@ int main(int argc,const char *argv[])                                     /*{{{*/
       {0,"fix-missing","APT::Get::Fix-Missing",0},
       {0,"ignore-hold","APT::Ignore-Hold",0},      
       {0,"upgrade","APT::Get::upgrade",0},
       {0,"fix-missing","APT::Get::Fix-Missing",0},
       {0,"ignore-hold","APT::Ignore-Hold",0},      
       {0,"upgrade","APT::Get::upgrade",0},

+      {0,"only-upgrade","APT::Get::Only-Upgrade",0},

       {0,"force-yes","APT::Get::force-yes",0},
       {0,"print-uris","APT::Get::Print-URIs",0},
       {0,"diff-only","APT::Get::Diff-Only",0},
       {0,"force-yes","APT::Get::force-yes",0},
       {0,"print-uris","APT::Get::Print-URIs",0},
       {0,"diff-only","APT::Get::Diff-Only",0},