From 504bbe47e634f07c3de7a4868f63ee2ec142b9e4 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 12 Sep 2006 11:19:35 +0200
Subject: * methods/gzip.cc:   - if it can't write (because var is full), close
 the FromGz stream     to not hang in ExecWait() later

---
 methods/gzip.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'methods/gzip.cc')

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 809afc0fc..55ff33270 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -111,6 +111,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       if (To.Write(Buffer,Count) == false)
       {
 	 Failed = true;
+	 FromGz.Close();
 	 break;
       }      
    }
-- 
cgit v1.2.3


From 84cc6f7364d31321698ab3182bcd10d575710a49 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Sat, 30 Sep 2006 14:14:04 +0200
Subject: * methods/gzip.cc:   - just stop on empty files, don't call the
 extractor * debian/changelog:   - merged the last debian upload   - added
 entry for extractor

---
 methods/gzip.cc | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'methods/gzip.cc')

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 55ff33270..a8e816bf3 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -52,6 +52,13 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    // Open the source and destination files
    FileFd From(Path,FileFd::ReadOnly);
 
+   // if the file is empty, just rename it and return
+   if(From.Size() == 0) 
+   {
+      Rename(Path, Itm->DestFile);
+      return true;
+   }
+
    int GzOut[2];   
    if (pipe(GzOut) < 0)
       return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);
-- 
cgit v1.2.3


From 60a9e375317c42f6682704e2769b7b2776c7ec12 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Sat, 30 Sep 2006 16:30:42 +0200
Subject: * methods/gzip.cc:   - fix invalid reanem

---
 methods/gzip.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'methods/gzip.cc')

diff --git a/methods/gzip.cc b/methods/gzip.cc
index a8e816bf3..f732c0b86 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -55,7 +55,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    // if the file is empty, just rename it and return
    if(From.Size() == 0) 
    {
-      Rename(Path, Itm->DestFile);
+      rename(Path.c_str(), Itm->DestFile.c_str());
       return true;
    }
 
-- 
cgit v1.2.3