summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-09-09 19:04:26 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-09-09 19:04:26 +0200
commit3fcc94e919bad291348d53b1fd37b21ddf789cfd (patch)
tree0f94ba1cb15f2ff09c40d1d930216933351a4ae5 /apt-pkg
parent2a19ec29ab5491fdb12a3ccaa1601097fdc83c86 (diff)
parent56bc3358caba1162d6e6108d5f6e5893de0dccec (diff)
* ftparchive/writer.cc:
- null the valid string instead of the date if Valid-Until is not set * apt-pkg/acquire-item.cc: - use also unsigned Release files again (Closes: #596189)
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-item.cc16
1 files changed, 10 insertions, 6 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 752bc6a99..7257f89e4 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1060,12 +1060,6 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash, /*{{{*
// all cool, move Release file into place
Complete = true;
-
- string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI);
- Rename(DestFile,FinalFile);
- chmod(FinalFile.c_str(),0644);
- DestFile = FinalFile;
}
else
{
@@ -1092,8 +1086,18 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash, /*{{{*
Desc.URI = "gpgv:" + SigFile;
QueueURI(Desc);
Mode = "gpgv";
+ return;
}
}
+
+ if (Complete == true)
+ {
+ string FinalFile = _config->FindDir("Dir::State::lists");
+ FinalFile += URItoFileName(RealURI);
+ Rename(DestFile,FinalFile);
+ chmod(FinalFile.c_str(),0644);
+ DestFile = FinalFile;
+ }
}
/*}}}*/
void pkgAcqMetaIndex::RetrievalDone(string Message) /*{{{*/