Author: donaldp
Date: Sun Apr 28 23:38:04 2013
New Revision: 1476862
URL: http://svn.apache.org/r1476862
Log:
BUILDR-666 ZipFile.open modifies file regardless of usage.
Reported by Pepijn Van Eeckhoudt, fix by Alex Boisvert.
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/packaging/zip.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1476862&r1=1476861&r2=1476862&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sun Apr 28 23:38:04 2013
@@ -1,4 +1,6 @@
1.4.12 (Pending)
+* Fixed: BUILDR-666 ZipFile.open modifies file regardless of usage.
+ Reported by Pepijn Van Eeckhoudt, fix by Alex Boisvert.
* Change: Moved to using TravisCI to test the Linux variants.
* Added: When generating the GWT facet for Intellij IDEA modules, use
the gwt-dev maven artifact dependency if present as the SDK,
Modified: buildr/trunk/lib/buildr/packaging/zip.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/zip.rb?rev=1476862&r1=1476861&r2=1476862&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/zip.rb (original)
+++ buildr/trunk/lib/buildr/packaging/zip.rb Sun Apr 28 23:38:04 2013
@@ -176,8 +176,11 @@ module Zip #:nodoc:
end
class ZipEntrySet
+ alias_method :original_push, :"<<"
+ alias_method :push, :"<<"
+
def <<(entry)
- @entrySet[entry.name.to_s] = entry if entry != nil
+ original_push(entry) if entry != nil
end
end
end
