[Apt-listbugs-commits] [SCM] dpkg-ruby development branch, master, updated. debian/0.3.4-3-g17a9cc7

[Ryan Niebur]

The following commit has been merged in the master branch:
commit c5e7730104ff78dc9ddbc38816065a22ba02856a
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Fri Jan 8 18:26:30 2010 -0800

    more file leaks fixed

diff --git a/lib/debian.rb b/lib/debian.rb
index ced8a50..5bad746 100644
--- a/lib/debian.rb
+++ b/lib/debian.rb
@@ -519,8 +519,12 @@ module Debian
 	Debian::Utils.gunzip(ctz) {|ct|
 	  Debian::Utils.tar(ct, op, *pat) {|fp|
 	    if block_given?
-	      return yield(fp)
+              ct.close
+              retval = yield(fp)
+              fp.close
+	      return retval
 	    else
+              ct.close
 	      return fp
 	    end
 	  }
@@ -531,18 +535,18 @@ module Debian
     def control_fp(op, *pat)
       deb_fp("control.tar.gz", op, *pat) {|fp|
 	if block_given?
-	  return yield(fp)
+	  yield(fp)
 	else
-	  return fp
+	  fp
 	end
       }
     end
     def data_fp(op, *pat)
       deb_fp("data.tar.gz", op, *pat) {|fp|
 	if block_given?
-	  return yield(fp)
+	  yield(fp)
 	else
-	  return fp
+	  fp
 	end
       }
     end
@@ -575,14 +579,14 @@ module Debian
       end
       control_fp(Debian::Utils::TAR_EXTRACT, "*/#{cfile}") {|fp|
 	if block_given?
-	  return yield(fp)
+	  yield(fp)
 	else
-	  return fp
+	  fp
 	end
       }
     end
     def controlData(cfile = "control")
-      controlFile(cfile) {|fp| return fp.readlines.join("") }
+      controlFile(cfile) {|fp| fp.readlines.join("") }
     end
     def dataFile(fname)
       if /^\.\// =~ fname
@@ -593,14 +597,14 @@ module Debian
       end
       data_fp(Debian::Utils::TAR_EXTRACT, pat) {|fp|
 	if block_given?
-	  return yield(fp)
+	  yield(fp)
 	else
-	  return fp
+	  fp
 	end
       }
     end
     def dataData(fname)
-      dataFile(fname) {|fp| return fp.readlines.join("") }
+      dataFile(fname) {|fp| fp.readlines.join("") }
     end
     def sys_tarfile
       unless @filename || @artab
@@ -609,9 +613,9 @@ module Debian
       @artab.open("data.tar.gz") {|dtz|
 	Debian::Utils.gunzip(dtz) {|dt|
 	  if block_given?
-	    return yield(dt)
+	    yield(dt)
 	  else
-	    return dt
+	    dt
 	  end
 	}
       }

-- 
dpkg-ruby development