diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 30 | ||||
| -rw-r--r-- | ftparchive/contents.cc | 7 | ||||
| -rw-r--r-- | ftparchive/multicompress.cc | 1 | ||||
| -rw-r--r-- | methods/gpgv.cc | 17 | ||||
| -rwxr-xr-x | test/pre-upload-check.py | 16 |
6 files changed, 22 insertions, 51 deletions
diff --git a/configure.in b/configure.in index 1490d57b8..a2b554a0c 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.10ubuntu1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 6bed39d1b..2bfbc100a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,4 @@ -apt (0.7.10ubuntu1) hardy; urgency=low - - * methods/mirror.{cc,h}: - - only update mirror list on IndexFile updates - - -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Nov 2007 15:57:18 +0100 - -apt (0.7.10) unstable; urgency=low +apt (0.7.9ubuntu1) hardy; urgency=low [ Otavio Salvador ] * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to @@ -25,8 +18,20 @@ apt (0.7.10) unstable; urgency=low [ Michael Vogt ] * debian/rules - fix https install location + * methods/gpgv.cc: + - remove cruft code that caused timestamp/I-M-S issues + * ftparchive/contents.cc: + - fix error output + * methods/mirror.{cc,h}: + - only update mirror list on IndexFile updates - -- Michael Vogt <mvo@debian.org> Wed, 28 Nov 2007 17:10:49 +0100 + [ Chris Cheney ] + * ftparchive/contents.cc: + - support lzma data members + * ftparchive/multicompress.cc: + - support lzma output + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 06 Dec 2007 19:32:07 +0100 apt (0.7.9) unstable; urgency=low @@ -153,13 +158,6 @@ apt (0.7.7) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 23 Oct 2007 14:58:03 +0200 -apt (0.7.6) unstable; urgency=low - - * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong - directory downloading on non-linux architectures (closes: #435597) - - -- Otavio Salvador <otavio@debian.org> Wed, 01 Aug 2007 19:49:51 -0300 - apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low [ Michael Vogt ] diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index 3801995bd..1f2cbcc3d 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -314,7 +314,12 @@ bool ContentsExtract::Read(debDebFile &Deb) Compressor = "bzip2"; } if (Member == 0) { - _error->Error(_("Internal error, could not locate member %s"),"data.tar.gz"); + Member = Deb.GotoMember("data.tar.lzma"); + Compressor = "lzma"; + } + if (Member == 0) { + _error->Error(_("Internal error, could not locate member %s"), + "data.tar.{gz,bz2,lzma}"); return false; } diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 935c98877..2fc8efcbf 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -34,6 +34,7 @@ const MultiCompress::CompType MultiCompress::Compressors[] = {{".","",0,0,0,1}, {"gzip",".gz","gzip","-9n","-d",2}, {"bzip2",".bz2","bzip2","-9","-d",3}, + {"lzma",".lzma","lzma","-9","-d",4}, {}}; // MultiCompress::MultiCompress - Constructor /*{{{*/ diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 2b1fa5169..01b240856 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -266,23 +266,6 @@ bool GPGVMethod::Fetch(FetchItem *Itm) return _error->Error(errmsg.c_str()); } - // Transfer the modification times - struct stat Buf; - if (stat(Path.c_str(),&Buf) != 0) - return _error->Errno("stat",_("Failed to stat %s"), Path.c_str()); - - struct utimbuf TimeBuf; - TimeBuf.actime = Buf.st_atime; - TimeBuf.modtime = Buf.st_mtime; - if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) - return _error->Errno("utime",_("Failed to set modification time")); - - if (stat(Itm->DestFile.c_str(),&Buf) != 0) - return _error->Errno("stat",_("Failed to stat")); - - // Return a Done response - Res.LastModified = Buf.st_mtime; - Res.Size = Buf.st_size; // Just pass the raw output up, because passing it as a real data // structure is too difficult with the method stuff. We keep it // as three separate vectors for future extensibility. diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py index 373683360..268b3d672 100755 --- a/test/pre-upload-check.py +++ b/test/pre-upload-check.py @@ -120,22 +120,6 @@ class testLocalRepositories(unittest.TestCase): self.assert_(os.path.exists(os.path.join(self.repo,"Packages.gz")), "Packages.gz vanished from local repo") - def testLocalRepo2(self): - repo = os.path.abspath(os.path.join(os.getcwd(), self.repo_dir+"2")) - sources = os.path.join(self.repo, "sources.list") - s = open(sources,"w") - s.write("deb file://%s/ /\n" % repo) - s.close() - - # two times to get at least one i-m-s hit - for i in range(2): - self.assert_(os.path.exists(sources)) - cmd = [self.apt,"update","-o", "Dir::Etc::sourcelist=%s" % sources]+apt_args - res = call(cmd, stdout=stdout, stderr=stderr) - self.assertEqual(res, 0, "local repo2 test failed") - self.assert_(os.path.exists(os.path.join(repo,"Packages.gz")), - "Packages.gz vanished from local repo") - def testInstallFromLocalRepo(self): apt = [self.apt,"-o", "Dir::Etc::sourcelist=%s"% self.sources]+apt_args cmd = apt+["update"] |