summaryrefslogtreecommitdiff
path: root/methods/gzip.cc
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-03-12 14:24:41 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2014-03-13 13:58:47 +0100
commit0ec6b98b24939100a6d4c333abe5bc62a4455f9f (patch)
tree6853082f6de7b6eb73a4746af5b651821d3f2e23 /methods/gzip.cc
parent36e7727f70cde14b95f72029a9e2663672ef4da8 (diff)
add a config option to switch uncompress methods to compress
Not very useful in the normal operation of work, but handy for tests. Git-Dch: Ignore
Diffstat (limited to 'methods/gzip.cc')
-rw-r--r--methods/gzip.cc27
1 files changed, 18 insertions, 9 deletions
diff --git a/methods/gzip.cc b/methods/gzip.cc
index ace5e9f71..df3f8828f 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -11,6 +11,7 @@
// Include Files /*{{{*/
#include <config.h>
+#include <apt-pkg/configuration.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
@@ -60,17 +61,25 @@ bool GzipMethod::Fetch(FetchItem *Itm)
return _error->Error("Extraction of file %s requires unknown compressor %s", Path.c_str(), Prog);
// Open the source and destination files
- FileFd From;
- From.Open(Path, FileFd::ReadOnly, *compressor);
-
- if(From.FileSize() == 0)
- return _error->Error(_("Empty files can't be valid archives"));
-
- FileFd To(Itm->DestFile,FileFd::WriteAtomic);
+ FileFd From, To;
+ if (_config->FindB("Method::Compress", false) == false)
+ {
+ From.Open(Path, FileFd::ReadOnly, *compressor);
+ if(From.FileSize() == 0)
+ return _error->Error(_("Empty files can't be valid archives"));
+ To.Open(Itm->DestFile, FileFd::WriteAtomic);
+ }
+ else
+ {
+ From.Open(Path, FileFd::ReadOnly);
+ To.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty, *compressor);
+ }
To.EraseOnFailure();
- if (_error->PendingError() == true)
+
+ if (From.IsOpen() == false || From.Failed() == true ||
+ To.IsOpen() == false || To.Failed() == true)
return false;
-
+
// Read data from source, generate checksums and write
Hashes Hash;
bool Failed = false;