r56298 - in /trunk/dh-make-perl: debian/changelog lib/DhMakePerl/Command/refresh.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sat Apr 17 13:32:31 2010
New Revision: 56298

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=56298
Log:
refresh: keep current source format unless --source-format is given

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=56298&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Sat Apr 17 13:32:31 2010
@@ -23,6 +23,7 @@
   * when more than one package contain a given depended-on module, create
     alternative dependencies.
     Closes: #548367 -- detect alternative dependencies; Thanks to Slaven Rezic
+  * refresh: keep current source format unless --source-format is given
 
  -- Damyan Ivanov <dmn at debian.org>  Tue, 09 Mar 2010 08:46:09 +0200
 

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm?rev=56298&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm Sat Apr 17 13:32:31 2010
@@ -34,6 +34,21 @@
     $self->main_dir( $ARGV[0] || '.' );
     print "Engaging refresh mode in " . $self->main_dir . "\n"
         if $self->cfg->verbose;
+
+    if ( not $self->cfg->_explicitly_set->{'source-format'}
+        and -e ( my $f = catfile( $self->debian_file('source'), 'format' ) ) )
+    {
+        open( my $fh, '<', $f ) or die "open($f): $!";
+        my $present = <$fh>;
+        close $fh;
+
+        chomp($present) if $present;
+        if ($present) {
+            $self->cfg->source_format($present);
+            print "Detected source format: $present\n"
+                if $self->cfg->verbose;
+        }
+    }
 
     $self->control->read( $self->debian_file('control') );
     $self->fill_maintainer;