You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@buildr.apache.org by bo...@apache.org on 2011/05/27 19:59:19 UTC

svn commit: r1128411 - in /buildr/trunk: CHANGELOG lib/buildr/packaging/zip.rb

Author: boisvert
Date: Fri May 27 17:59:19 2011
New Revision: 1128411

URL: http://svn.apache.org/viewvc?rev=1128411&view=rev
Log:
BUILDR-585 "TypeError : can't dup NilClass" when merging jars

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=1128411&r1=1128410&r2=1128411&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri May 27 17:59:19 2011
@@ -11,6 +11,7 @@
 * Fixed:  BUILDR-573 HTTP upload PUT request with incorrect Content-Type (Mathias Doenitz)
 * Fixed:  BUILDR-578 Tar task does not preserve uid/gid on folders (Jean-Philippe Caruana)
 * Fixed:  BUILDR-251 Classifier not handled when downloading snapshot artifacts (Ryan Fowler)
+* Fixed:  BUILDR-585 "TypeError : can't dup NilClass" when merging jars
 
 1.4.5 (2011-02-20)
 * Added:  BUILDR-555 Add support for the jaxb binding compiler (Mark Petrovic)

Modified: buildr/trunk/lib/buildr/packaging/zip.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/zip.rb?rev=1128411&r1=1128410&r2=1128411&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/zip.rb (original)
+++ buildr/trunk/lib/buildr/packaging/zip.rb Fri May 27 17:59:19 2011
@@ -175,4 +175,10 @@ module Zip #:nodoc:
 
     end
   end
+
+  class ZipEntrySet
+    def <<(entry)
+      @entrySet[entry.to_s] = entry if entry != nil
+    end
+  end
 end