r56533 - in /trunk/dh-make-perl: Changes lib/DhMakePerl/Command/Packaging.pm lib/DhMakePerl/Command/refresh.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Mon Apr 19 14:15:47 2010
New Revision: 56533

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=56533
Log:
refresh: init ->rules before ->rules->drop_quilt

this avoinds calling undef->drop_quilt when source-format is changed with
--only control

Modified:
    trunk/dh-make-perl/Changes
    trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm
    trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm

Modified: trunk/dh-make-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/Changes?rev=56533&op=diff
==============================================================================
--- trunk/dh-make-perl/Changes (original)
+++ trunk/dh-make-perl/Changes Mon Apr 19 14:15:47 2010
@@ -1,2 +1,4 @@
 0.67
     POD: drop "--" in front of the commands.
+    refresh: ensure ->rules is there before attempting to fiddle quilt
+        integration

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm?rev=56533&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm Mon Apr 19 14:15:47 2010
@@ -655,6 +655,16 @@
         },
         $dir
     );
+}
+
+sub read_rules {
+    my $self = shift;
+
+    return if $self->rules;
+
+    my $file = $self->debian_file('rules');
+
+    $self->rules( Debian::Rules->new($file) );
 }
 
 sub create_rules {

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=56533&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm Mon Apr 19 14:15:47 2010
@@ -119,6 +119,8 @@
 
 sub add_quilt {
     my( $self, $control ) = @_;
+
+    $self->read_rules;
 
     $self->rules->add_quilt;
 
@@ -177,6 +179,8 @@
 sub drop_quilt {
     my( $self, $control ) = @_;
 
+    $self->read_rules;
+
     $self->rules->drop_quilt;
 
     # README.source