Merge pull request #1203 from liger1978/fix_merge

Ensured result is not nil. Fixes #1202.
jordansissel · Oct 16, 2016 · e9a6f63 · e9a6f63
2 parents 9af51d7 + 33216ad
commit e9a6f63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -20,6 +20,7 @@ llasram
 sbuss
 Brett Gailey (github: dnbert)
 Daniel Haskin (github: djhaskin987)
+Richard Grainger (github: liger1978)
 
 If you have contributed (bug reports, feature requests, help in IRC, blog
 posts, code, etc) and aren't listed here, please let me know if you wish to be

diff --git a/lib/fpm/package/cpan.rb b/lib/fpm/package/cpan.rb
@@ -49,6 +49,7 @@ def input(package)
 
     if File.exist?(package)
       moduledir = package
+      result = {}
     else
       result = search(package)
       tarball = download(result, version)