From 37bb96cc5991b4e762264a5dcb073bfeb3a48455 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 29 Nov 2007 11:34:24 +0100 Subject: test/pre-upload-check.py: - remove bogus "testLocalRepo2" test case --- test/pre-upload-check.py | 16 ---------------- 1 file changed, 16 deletions(-) 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"] -- cgit v1.2.3-70-g09d2 From 24e135b60082a96776589ddbb2744574ddfb75e6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Nov 2007 13:00:15 +0100 Subject: * ftparchive/contents.cc: - fix error output * ftparchive/contents.cc: - support lzma data members * ftparchive/multicompress.cc: - support lzma output --- debian/changelog | 7 +++++++ ftparchive/contents.cc | 7 ++++++- ftparchive/multicompress.cc | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 832ee11d4..ca4a9bbe7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,13 @@ apt (0.7.10) unstable; urgency=low [ Michael Vogt ] * debian/rules - fix https install location + * ftparchive/contents.cc: + - fix error output + [ Chris Cheney ] + * ftparchive/contents.cc: + - support lzma data members + * ftparchive/multicompress.cc: + - support lzma output -- Michael Vogt Wed, 28 Nov 2007 17:10:49 +0100 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 /*{{{*/ -- cgit v1.2.3-70-g09d2 From 8076139ead08124e86be5f993baa8a43c22b0137 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 6 Dec 2007 18:40:09 +0100 Subject: * methods/gpgv.cc: - remove cruft code that caused timestamp/I-M-S issues --- debian/changelog | 3 +++ methods/gpgv.cc | 17 ----------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca4a9bbe7..fd2162b2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,11 @@ 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 + [ Chris Cheney ] * ftparchive/contents.cc: - support lzma data members 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. -- cgit v1.2.3-70-g09d2