[DRE-commits] [gem2deb] 01/01: Gem2Deb::GemInstaller: skip lib/ cleanup when there is no lib/

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository gem2deb.

commit 2d3cfe7e0caa05add8a141e92789092e3aa3dc0f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Dec 1 18:32:23 2016 -0200

    Gem2Deb::GemInstaller: skip lib/ cleanup when there is no lib/
---
 debian/changelog             | 2 ++
 lib/gem2deb/gem_installer.rb | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 274d631..456a89d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ gem2deb (0.33) UNRELEASED; urgency=medium
     suite on jessie (Closes: #835588)
   * gem2deb-test-runner:
     - fix documentation of $GEM2DEB_TEST_RUNNER in manpage
+  * Gem2Deb::GemInstaller
+    - don't try to remove empty directories from lib/ if there is no lib/
 
   [ Stefano Rivera ]
   * gem2deb-test-runner: Add Build-Dep on dpkg-dev. Autopkgtests may use this,
diff --git a/lib/gem2deb/gem_installer.rb b/lib/gem2deb/gem_installer.rb
index 4e90ac1..74229ed 100644
--- a/lib/gem2deb/gem_installer.rb
+++ b/lib/gem2deb/gem_installer.rb
@@ -119,7 +119,9 @@ module Gem2Deb
             FileUtils::Verbose.rm_f Dir.glob('lib/**/*.so')
 
             # remove empty directories inside lib/
-            run 'find', 'lib/', '-type', 'd', '-empty', '-delete'
+            if File.directory?('lib')
+              run 'find', 'lib/', '-type', 'd', '-empty', '-delete'
+            end
           end
         end
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gem2deb.git