merge with the debian tree

[apt.git] / apt-pkg / acquire-item.cc

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 3e6262c96f72313680e8c52105bd27b3870671fd..8d647cdf2e40888d0a2f71c9a3ae786ccaaffe2e 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -395,7 +395,7 @@ void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash,
  */
 pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner,
                                   string URI,string URIDesc,string ShortDesc,
  */
 pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner,
                                   string URI,string URIDesc,string ShortDesc,

-                                  HashString ExpectedMD5, 
+                                  HashString ExpectedHash, 

                                   vector<DiffInfo> diffs)
    : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), 
      available_patches(diffs)
                                   vector<DiffInfo> diffs)
    : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), 
      available_patches(diffs)


@@ -724,10 +724,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
    {
       // The files timestamp matches
       if (StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true)
    {
       // The files timestamp matches
       if (StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true)

-      {
-        unlink(FileName.c_str());

         return;
         return;

-      }

       Decompression = true;
       Local = true;
       DestFile += ".decomp";
       Decompression = true;
       Local = true;
       DestFile += ".decomp";


@@ -746,10 +743,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
    
    // The files timestamp matches
    if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
    
    // The files timestamp matches
    if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)

-   {
-      unlink(FileName.c_str());

       return;
       return;

-   }

 
    if (FileName == DestFile)
       Erase = true;
 
    if (FileName == DestFile)
       Erase = true;


@@ -757,7 +751,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
       Local = true;
    
    string compExt = Desc.URI.substr(Desc.URI.size()-3);
       Local = true;
    
    string compExt = Desc.URI.substr(Desc.URI.size()-3);

-   char *decompProg;
+   const char *decompProg;

    if(compExt == "bz2") 
       decompProg = "bzip2";
    else if(compExt == ".gz") 
    if(compExt == "bz2") 
       decompProg = "bzip2";
    else if(compExt == ".gz")