[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

version 0.9.7



Bonjour,

un petit bogue :
conflit de noms de variables

a+

Nicolas
-- 
--- ddts-rev.old	Sun Sep 23 17:49:20 2001
+++ ddts-rev	Sun Sep 23 20:22:21 2001
@@ -108,7 +108,7 @@
   
 =cut
 
-my $version="0.9.5";
+my $version="0.9.7";
 
 # Test if configuration as been made
 if (! -d $home) {
@@ -284,9 +284,9 @@
 
 		# If description eq last review rename $pkg.$todo in $pkg.$rev
 		# so the reviewer won't spend time with it
-		my($tmp) = &pkg2tmptransid("$home", "$pkg");
-		my($new) = &rev2newcomment("$home", "$pkg.$rev.old");
-		if ($tmp eq $new) {
+		my($temp) = &pkg2tmptransid("$home", "$pkg");
+		my($correct) = &rev2newcomment("$home", "$pkg.$rev.old");
+		if ($temp eq $correct) {
 		    print "$pkg is ok\n";
 		    &remove ($home, "$pkg.$rev.old");
 		    print "Moving       $pkg.$todo -> $pkg.$rev\n";
@@ -379,7 +379,8 @@
 	    }
 	    $boundary="----------=_".scalar(time)."-$$-".$BCount++;
 
-	    my($tmp, $translator, $reportid) = &pkg2tmptransid("$home", "$pkg");
+	    my($temp, $translator, $reportid) = &pkg2tmptransid("$home", "$pkg");
+	    my($correct, $comment) = &rev2newcomment("$home", "$pkg.$rev");
 	    
 	    # build the mail
 	    my $text = "From: $mail_from\n"
@@ -397,7 +398,6 @@
 	      ."Content-Disposition: inline\n"
 	      ."Content-Transfer-Encoding: $mail_enc\n\n"
 	      .$mail_begin;
-	    my($new, $comment) = &rev2newcomment("$home", "$pkg.$rev");
 	    $text .= $comment;
 	    $text .= $mail_end;
 
@@ -406,19 +406,19 @@
 		  ."--$boundary\n"
 		  ."Content-Type: text/plain; charset=$mail_charset\n"
 		  ."Content-Disposition: attachment; filename=\"$pkg.new\"\n\n"
-		  .$new;
+		  .$correct;
 	    }
 	    
 	    $text .= "\n\n"
 	      ."--$boundary\n"
 	      ."Content-Type: text/plain; charset=$mail_charset\n"
 	      ."Content-Disposition: attachment; filename=\"$pkg.diff\"\n\n";
-	    if ($tmp eq $new) {
+	    if ($temp eq $correct) {
 		# empty diff
 		print OK $pkg."\n";
 	    } else {
 		# puts the diff
-		$text .= &diff($pkg, $tmp, $new);
+		$text .= &diff($pkg, $temp, $correct);
 		
 		# Ends the mime stuff
 		$text .= "--$boundary--\n\n";

Reply to: