Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-private / private-update.cc

diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc
index fa827dea4216bd3689fa8d8ec15bb77c22d40897..df77ac33a91b6230a06c90a9e7b4bab78bbbb4d3 100644 (file)
--- a/apt-private/private-update.cc
+++ b/apt-private/private-update.cc
@@ -47,19 +47,24 @@ bool DoUpdate(CommandLine &CmdL)
       _config->CndSet("Acquire::ForceHash", "md5sum");
 
       // get a fetcher
       _config->CndSet("Acquire::ForceHash", "md5sum");
 
       // get a fetcher

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

 
       // Populate it with the source selection and get all Indexes 
       // (GetAll=true)
       if (List->GetIndexes(&Fetcher,true) == false)
         return false;
 
 
       // Populate it with the source selection and get all Indexes 
       // (GetAll=true)
       if (List->GetIndexes(&Fetcher,true) == false)
         return false;
 

+      std::string compExt = APT::Configuration::getCompressionTypes()[0];

       pkgAcquire::UriIterator I = Fetcher.UriBegin();
       for (; I != Fetcher.UriEnd(); ++I)
       pkgAcquire::UriIterator I = Fetcher.UriBegin();
       for (; I != Fetcher.UriEnd(); ++I)

-        c1out << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
+      {
+         std::string FileName = flNotDir(I->Owner->DestFile);
+         if(compExt.empty() == false && 
+            APT::String::Endswith(FileName, compExt))
+            FileName = FileName.substr(0, FileName.size() - compExt.size() - 1);
+        c1out << '\'' << I->URI << "' " << FileName << ' ' << 

             I->Owner->FileSize << ' ' << I->Owner->HashSum() << std::endl;
             I->Owner->FileSize << ' ' << I->Owner->HashSum() << std::endl;

+      }

       return true;
    }
 
       return true;
    }
 


@@ -83,14 +88,17 @@ bool DoUpdate(CommandLine &CmdL)
       for (pkgCache::PkgIterator I = Cache->PkgBegin(); I.end() != true; ++I)
       {
          pkgDepCache::StateCache &state = Cache[I];
       for (pkgCache::PkgIterator I = Cache->PkgBegin(); I.end() != true; ++I)
       {
          pkgDepCache::StateCache &state = Cache[I];

-         if (I->CurrentVer != 0 && state.Upgradable())
+         if (I->CurrentVer != 0 && state.Upgradable() && state.CandidateVer != NULL)

             upgradable++;
       }
             upgradable++;
       }

-      const char *msg = ngettext(
+      const char *msg = P_(

          "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n",
          "%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n",
          upgradable);
          "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n",
          "%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n",
          upgradable);

-      ioprintf(c1out, msg, upgradable);
+      if (upgradable == 0)
+         c1out << _("All packages are up to date.") << std::endl;
+      else
+         ioprintf(c1out, msg, upgradable);

    }
 
    return true;
    }
 
    return true;