* Merged from the mvo branch

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index ca14f4c2bbc459d17690e47cc19d89ce1045ceda..a5a48cf2f0b70f8acd6a3dc123f90ec027ef33b7 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -862,10 +862,14 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
    {
       struct statvfs Buf;
       string OutputDir = _config->FindDir("Dir::Cache::Archives");
    {
       struct statvfs Buf;
       string OutputDir = _config->FindDir("Dir::Cache::Archives");

-      if (statvfs(OutputDir.c_str(),&Buf) != 0)
-        return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
-                             OutputDir.c_str());
-      if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
+      if (statvfs(OutputDir.c_str(),&Buf) != 0) {
+        if (errno == EOVERFLOW)
+           return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
+                                OutputDir.c_str());
+        else
+           return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
+                                OutputDir.c_str());
+      } else if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)

       {
          struct statfs Stat;
          if (statfs(OutputDir.c_str(),&Stat) != 0
       {
          struct statfs Stat;
          if (statfs(OutputDir.c_str(),&Stat) != 0


@@ -1243,131 +1247,143 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
                               pkgSrcRecords &SrcRecs,string &Src,
                               pkgDepCache &Cache)
 {
                               pkgSrcRecords &SrcRecs,string &Src,
                               pkgDepCache &Cache)
 {

-       string VerTag;
-       string DefRel = _config->Find("APT::Default-Release");
-       string TmpSrc = Name;
-       const size_t found = TmpSrc.find_last_of("/=");
-
-       // extract the version/release from the pkgname
-       if (found != string::npos) {
-               if (TmpSrc[found] == '/')
-                       DefRel = TmpSrc.substr(found+1);
-               else
-                       VerTag = TmpSrc.substr(found+1);
-               TmpSrc = TmpSrc.substr(0,found);
-       }
-
-       /* Lookup the version of the package we would install if we were to
-          install a version and determine the source package name, then look
-          in the archive for a source package of the same name. */
-       bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
-       const pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
-       if (MatchSrcOnly == false && Pkg.end() == false) {
-               if(VerTag.empty() == false || DefRel.empty() == 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
-                       for (pkgCache::VerIterator Ver = Pkg.VersionList();
-                            Ver.end() == false; Ver++) {
-                               for (pkgCache::VerFileIterator VF = Ver.FileList();
-                                    VF.end() == false; VF++) {
-                                       /* If this is the status file, and the current version is not the
-                                          version in the status file (ie it is not installed, or somesuch)
-                                          then it is not a candidate for installation, ever. This weeds
-                                          out bogus entries that may be due to config-file states, or
-                                          other. */
-                                       if ((VF.File()->Flags & pkgCache::Flag::NotSource) ==
-                                           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) ||
-                                          (VF.File().Codename() != 0 && VF.File().Codename() == DefRel)) {
-                                               pkgRecords::Parser &Parse = Recs.Lookup(VF);
-                                               Src = Parse.SourcePkg();
-                                               if (VerTag.empty() == true)
-                                                       VerTag = Parse.SourceVer();
-                                               break;
-                                       }
-                               }
-                       }
-                       if (Src.empty() == true) {
-                               if (VerTag.empty() == false)
-                                       _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
-                               else
-                                       _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
-                               VerTag.clear();
-                               DefRel.clear();
-                       }
-               }
-               if (VerTag.empty() == true && DefRel.empty() == true) {
-                       // if we don't have a version or default release, use the CandidateVer to find the Source
-                       pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
-                       if (Ver.end() == false) {
-                               pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
-                               Src = Parse.SourcePkg();
-                               VerTag = Parse.SourceVer();
-                       }
-               }
-       }
-
-       if (Src.empty() == true)
-               Src = TmpSrc;
-       else {
-               /* if we have a source pkg name, make sure to only search
-                  for srcpkg names, otherwise apt gets confused if there
-                  is a binary package "pkg1" and a source package "pkg1"
-                  with the same name but that comes from different packages */
-               MatchSrcOnly = true;
-               if (Src != TmpSrc) {
-                       ioprintf(c1out, _("Picking '%s' as source package instead of '%s'\n"), Src.c_str(), TmpSrc.c_str());
-               }
-       }
-
-       // The best hit
-       pkgSrcRecords::Parser *Last = 0;
-       unsigned long Offset = 0;
-       string Version;
-
-       /* Iterate over all of the hits, which includes the resulting
-          binary packages in the search */
-       pkgSrcRecords::Parser *Parse;
-       while (true) {
-               SrcRecs.Restart();
-               while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) {
-                       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)
-                               continue;
-
-                       // Newer version or an exact match? Save the hit
-                       if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0) {
-                               Last = Parse;
-                               Offset = Parse->Offset();
-                               Version = Ver;
-                       }
-
-                       // was the version check above an exact match? If so, we don't need to look further
-                       if (VerTag.empty() == false && VerTag.size() == Ver.size())
-                               break;
-               }
-               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();
-       }
-
-       if (Last == 0 || Last->Jump(Offset) == false)
-               return 0;
-
-       return Last;
+   string VerTag;
+   string DefRel = _config->Find("APT::Default-Release");
+   string TmpSrc = Name;
+
+   // extract the version/release from the pkgname
+   const size_t found = TmpSrc.find_last_of("/=");
+   if (found != string::npos) {
+      if (TmpSrc[found] == '/')
+        DefRel = TmpSrc.substr(found+1);
+      else
+        VerTag = TmpSrc.substr(found+1);
+      TmpSrc = TmpSrc.substr(0,found);
+   }
+
+   /* Lookup the version of the package we would install if we were to
+      install a version and determine the source package name, then look
+      in the archive for a source package of the same name. */
+   bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
+   const pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
+   if (MatchSrcOnly == false && Pkg.end() == false) 
+   {
+      if(VerTag.empty() == false || DefRel.empty() == 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
+        for (pkgCache::VerIterator Ver = Pkg.VersionList();
+             Ver.end() == false; Ver++) 
+        {
+           for (pkgCache::VerFileIterator VF = Ver.FileList();
+                VF.end() == false; VF++) 
+           {
+              /* If this is the status file, and the current version is not the
+                 version in the status file (ie it is not installed, or somesuch)
+                 then it is not a candidate for installation, ever. This weeds
+                 out bogus entries that may be due to config-file states, or
+                 other. */
+              if ((VF.File()->Flags & pkgCache::Flag::NotSource) ==
+                  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) ||
+                 (VF.File().Codename() != 0 && VF.File().Codename() == DefRel)) 
+              {
+                 pkgRecords::Parser &Parse = Recs.Lookup(VF);
+                 Src = Parse.SourcePkg();
+                 if (VerTag.empty() == true)
+                    VerTag = Parse.SourceVer();
+                 break;
+              }
+           }
+        }
+        if (Src.empty() == true) 
+        {
+           if (VerTag.empty() == false)
+              _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+           else
+              _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
+           VerTag.clear();
+           DefRel.clear();
+        }
+      }
+      if (VerTag.empty() == true && DefRel.empty() == true) 
+      {
+        // if we don't have a version or default release, use the CandidateVer to find the Source
+        pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
+        if (Ver.end() == false) 
+        {
+           pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
+           Src = Parse.SourcePkg();
+           VerTag = Parse.SourceVer();
+        }
+      }
+   }
+
+   if (Src.empty() == true)
+      Src = TmpSrc;
+   else 
+   {
+      /* if we have a source pkg name, make sure to only search
+        for srcpkg names, otherwise apt gets confused if there
+        is a binary package "pkg1" and a source package "pkg1"
+        with the same name but that comes from different packages */
+      MatchSrcOnly = true;
+      if (Src != TmpSrc) 
+      {
+        ioprintf(c1out, _("Picking '%s' as source package instead of '%s'\n"), Src.c_str(), TmpSrc.c_str());
+      }
+   }
+
+   // The best hit
+   pkgSrcRecords::Parser *Last = 0;
+   unsigned long Offset = 0;
+   string Version;
+
+   /* Iterate over all of the hits, which includes the resulting
+      binary packages in the search */
+   pkgSrcRecords::Parser *Parse;
+   while (true) 
+   {
+      SrcRecs.Restart();
+      while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) 
+      {
+        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)
+           continue;
+
+        // Newer version or an exact match? Save the hit
+        if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0) {
+           Last = Parse;
+           Offset = Parse->Offset();
+           Version = Ver;
+        }
+
+        // was the version check above an exact match? If so, we don't need to look further
+        if (VerTag.empty() == false && VerTag.size() == Ver.size())
+           break;
+      }
+      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();
+   }
+
+   if (Last == 0 || Last->Jump(Offset) == false)
+      return 0;
+
+   return Last;

 }
                                                                        /*}}}*/
 // DoUpdate - Update the package lists                                 /*{{{*/
 }
                                                                        /*}}}*/
 // DoUpdate - Update the package lists                                 /*{{{*/


@@ -2161,6 +2177,33 @@ bool DoSource(CommandLine &CmdL)
       if (Last == 0)
         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
       
       if (Last == 0)
         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
       

+      string srec = Last->AsStr();
+      string::size_type pos = srec.find("\nVcs-");
+      while (pos != string::npos)
+      {
+        pos += strlen("\nVcs-");
+        string vcs = srec.substr(pos,srec.find(":",pos)-pos);
+        if(vcs == "Browser") 
+        {
+           pos = srec.find("\nVcs-", pos);
+           continue;
+        }
+        pos += vcs.length()+2;
+        string::size_type epos = srec.find("\n", pos);
+        string uri = srec.substr(pos,epos-pos).c_str();
+        ioprintf(c1out, _("NOTICE: '%s' packaging is maintained in "
+                          "the '%s' version control system at:\n"
+                          "%s\n"),
+                 Src.c_str(), vcs.c_str(), uri.c_str());
+        if(vcs == "Bzr") 
+           ioprintf(c1out,_("Please use:\n"
+                            "bzr get %s\n"
+                            "to retrieve the latest (possibly unreleased) "
+                            "updates to the package.\n"),
+                    uri.c_str());
+        break;
+      }
+

       // Back track
       vector<pkgSrcRecords::File> Lst;
       if (Last->Files(Lst) == false)
       // Back track
       vector<pkgSrcRecords::File> Lst;
       if (Last->Files(Lst) == false)


@@ -2228,10 +2271,14 @@ bool DoSource(CommandLine &CmdL)
    // Check for enough free space
    struct statvfs Buf;
    string OutputDir = ".";
    // Check for enough free space
    struct statvfs Buf;
    string OutputDir = ".";

-   if (statvfs(OutputDir.c_str(),&Buf) != 0)
-      return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
-                          OutputDir.c_str());
-   if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
+   if (statvfs(OutputDir.c_str(),&Buf) != 0) {
+      if (errno == EOVERFLOW)
+        return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
+                               OutputDir.c_str());
+      else
+        return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
+                               OutputDir.c_str());
+   } else if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)

      {
        struct statfs Stat;
        if (statfs(OutputDir.c_str(),&Stat) != 0
      {
        struct statfs Stat;
        if (statfs(OutputDir.c_str(),&Stat) != 0


@@ -2791,6 +2838,7 @@ int main(int argc,const char *argv[])                                     /*{{{*/
       {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},

+      {0,"debian-only","APT::Get::Diff-Only",0},

       {0,"tar-only","APT::Get::Tar-Only",0},
       {0,"dsc-only","APT::Get::Dsc-Only",0},
       {0,"purge","APT::Get::Purge",0},
       {0,"tar-only","APT::Get::Tar-Only",0},
       {0,"dsc-only","APT::Get::Dsc-Only",0},
       {0,"purge","APT::Get::Purge",0},


@@ -2813,7 +2861,6 @@ int main(int argc,const char *argv[])                                     /*{{{*/
                                    {"remove",&DoInstall},
                                    {"purge",&DoInstall},
                                   {"autoremove",&DoInstall},
                                    {"remove",&DoInstall},
                                    {"purge",&DoInstall},
                                   {"autoremove",&DoInstall},

-                                  {"purge",&DoInstall},

                                    {"dist-upgrade",&DoDistUpgrade},
                                    {"dselect-upgrade",&DoDSelectUpgrade},
                                   {"build-dep",&DoBuildDep},
                                    {"dist-upgrade",&DoDistUpgrade},
                                    {"dselect-upgrade",&DoDSelectUpgrade},
                                   {"build-dep",&DoBuildDep},