Changeset 254

Timestamp:

10/25/07 02:22:19 (6 years ago)

Author:

bruno

Message:

Change pb_changelog interface in order to have a way to not generate logs for projects not ready for it.

Location:

devel/pb/lib/ProjectBuilder

Files:

• Base.pm (modified) (1 diff)
• Changelog.pm (modified) (2 diffs)

devel/pb/lib/ProjectBuilder/Base.pm

@@ -595 +595 @@
         # special case for ChangeLog only for pb
         } elsif (($tmp =~ /^yes$/) && ($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
-            $tmp = "";
             my $p = $defpkgdir->{$pbpkg};
             $p = $extpkgdir->{$pbpkg} if (not defined $p);
-            pb_changelog($dtype, $pbpkg, $pbtag, $pbsuf, $p, \*DEST);
+            pb_changelog($dtype, $pbpkg, $pbver, $pbtag, $pbsuf, $p, \*DEST, $tmp);
+            $tmp = "";
         }
         $line =~ s|$s|$tmp|;

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -16 +16 @@
 my $dtype = shift;
 my $pkg = shift;
+my $pbver = shift;
 my $pbtag = shift;
 my $dsuf = shift;
 my $path = shift;
 my $OUTPUT = shift;
+my $doit = shift;
 
 my $log = "";
@@ -28 +30 @@
 return("\n") if ((not (defined $dtype)) || ($dtype eq "") || 
         (not (defined $pkg)) || ($pkg eq "") || 
+        (not (defined $pbver)) || ($pbver eq "") || 
         (not (defined $pbtag)) || ($pbtag eq "") || 
         (not (defined $dsuf)) || ($dsuf eq "") || 
         (not (defined $path)) || ($path eq "") || 
         (not (defined $OUTPUT)) || ($OUTPUT eq ""));
+        (not (defined $doit)) || ($doit eq ""));
 
 my $chglog = "$ENV{'PBROOT'}/$path/ChangeLog";
-if (! -f $chglog) {
+if ((! -f $chglog) && ($doit eq "yes")) {
     #print "No ChangeLog file ($chglog) for $pkg\n";
     return("\n");
+}
+
+# If we don't need to do it, fake something
+if ($doit ne "yes") {
+    my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
+    my $date = strftime("%Y-%m-%d", @date);
+    my $ndate = UnixDate($date,"%a", "%b", "%d", "%Y");
+    my $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
+    if (($dtype eq "rpm") || ($dtype eq "fc")) {
+        my $ver2 = "$pbver-$pbtag$dsuf";
+        print $OUTPUT "* $ndate $packager->{$ENV{'PBPROJ'}} $ver2\n";
+        print $OUTPUT "- Updated to $pbver\n";
+        }
+    if ($dtype eq "deb") {
+        print $OUTPUT "$pkg ($pbver) unstable; urgency=low\n";
+        print $OUTPUT "\n";
+        print $OUTPUT " -- $packager->{$ENV{'PBPROJ'}}  $n2date\n\n\n";
+        }
+    return;
 }