Changeset 20

Timestamp:

07/31/07 02:20:01 (6 years ago)

Author:

bruno

Message:

Content looks fine now

Location:

devel

Files:

• pb/bin/pb.pl (modified) (1 diff)
• pb/lib/changelog.pm (modified) (1 diff)
• pbconf/pb.pb (modified) (1 diff)

devel/pb/bin/pb.pl

@@ -299 +299 @@
             eval { $tmp =~ s/(\$\w+)/$1/eeg };
         # special case for ChangeLog
-        } elsif (($tmp =~ /^yes$/) && ($s =~ /^PBLOG$/)) {
+        } elsif (($tmp =~ /^yes$/) && ($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
             my $p = $defpkgdir{$pkg};
             $p = $extpkgdir{$pkg} if (not defined $p);
-            $tmp = changelog($dtype, $pkg, $pbtag, $dsuf, $p, \*DEST);
+            changelog($dtype, $pkg, $pbtag, $dsuf, $p, \*DEST);
+            $tmp = "";
         }
         $line =~ s|$s|$tmp|;

devel/pb/lib/changelog.pm

@@ -107 +107 @@
 }
 close(INPUT);
-return("\n");
 }
 1;

devel/pbconf/pb.pb

@@ -11 +11 @@
 
 # Packager for ChangeLogs
-confparam packager = "Bruno Cornec <bruno\@mondorescue.org>"
+confparam packager = "Bruno Cornec <bruno@mondorescue.org>"
 
 # If CVS give login method with CVSROOT