[DRE-commits] [gem2deb] 01/05: dh-make-ruby: avoid wrap-and-sort over existing debian/

[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 b19fd85e549424adeef9e7601e24a1715b678957
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat May 16 23:24:17 2015 -0300

    dh-make-ruby: avoid wrap-and-sort over existing debian/
    
    only call wrap-and-sort if either there was no previous packaging, or
    -w/--overwrite was passed.
---
 debian/changelog            | 2 ++
 lib/gem2deb/dh_make_ruby.rb | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f7c63ef..fc91643 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ gem2deb (0.17) UNRELEASED; urgency=medium
 
   * dh-make-ruby: fix call to wrap-and-sort
   * dh-make-ruby: add -w/--overwrite option to overwrite files under debian/
+  * dh-make-ruby: only call wrap-and-sort if either there was no previous
+    packaging, or -w/--overwrite was passed.
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 16 May 2015 22:51:18 -0300
 
diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
index a033ee5..6e205d4 100644
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@ -184,11 +184,14 @@ module Gem2Deb
     def build_in_directory(directory)
       Dir.chdir(directory) do
         read_upstream_source_info
+        previously_debianized = File.directory?('debian')
         FileUtils.mkdir_p('debian')
         other_files
         test_suite
         create_debian_boilerplates
-        wrap_and_sort
+        if overwrite || !previously_debianized
+          wrap_and_sort
+        end
       end
     end
 

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