r43803 - in /scripts/KGB: client/KGB_sendcommit debian/changelog

[dmn at users.alioth.debian.org]

Author: dmn
Date: Mon Sep  7 08:22:36 2009
New Revision: 43803

URL: http://svn.debian.org/wsvn/?sc=1&rev=43803
Log:
when branch or module cannot be detected, also undef $matched_re

this avoids wrong trimming of the changed paths in this case

Modified:
    scripts/KGB/client/KGB_sendcommit
    scripts/KGB/debian/changelog

Modified: scripts/KGB/client/KGB_sendcommit
URL: http://svn.debian.org/wsvn/scripts/KGB/client/KGB_sendcommit?rev=43803&op=diff
==============================================================================
--- scripts/KGB/client/KGB_sendcommit (original)
+++ scripts/KGB/client/KGB_sendcommit Mon Sep  7 08:22:36 2009
@@ -157,7 +157,7 @@
 
         # some change cannot be tied to a branch and a module?
         if ( !defined( $change_branch // $change_module ) ) {
-            $branch = $module = undef;
+            $branch = $module = $matched_re = undef;
             last;
         }
 
@@ -182,10 +182,12 @@
         #warn "Module: ".($module||"NONE");
         $safe->permit(qw(subst));
         for my $c(@changed) {
+            #warn "FROM ".$c->{path};
             $_ = $c->{path};
             $safe->reval("s,.*$matched_re,,");
             die "Eror while evaluating s/.*$matched_re//: $@" if $@;
             $c->{path} = $_;
+            #warn "  TO $_";
         }
     }
 

Modified: scripts/KGB/debian/changelog
URL: http://svn.debian.org/wsvn/scripts/KGB/debian/changelog?rev=43803&op=diff
==============================================================================
--- scripts/KGB/debian/changelog (original)
+++ scripts/KGB/debian/changelog Mon Sep  7 08:22:36 2009
@@ -2,6 +2,8 @@
 
   [ Damyan Ivanov ]
   * use "dir" or "dirs" depending on the number (1 or greater)
+  * avoid wrong trimming of changed paths when branch or module cannot be
+    detected
 
   [ gregor herrmann ]
   * debian/rules: simplify, and don't compress examples.