Changeset 559

Timestamp:

09/27/08 18:56:09 (5 years ago)

Author:

bruno

Message:

web2ssh is now producing a correct tar file, as well as generated news files

Files:

• devel/pb/bin/pb (modified) (3 diffs)
• pbconf/devel/project-builder/rpm/project-builder.spec (modified) (1 diff)

devel/pb/bin/pb

@@ -718 +718 @@
             # Instead call News generation
             pb_web_news2html($dest);
+            # And create an empty pbconf
+            pb_mkdir_p("$dest/pbconf");
         }
 
@@ -2170 +2172 @@
     # For date handling
     $ENV{LANGUAGE}="C";
-    my $firstjan = strftime("%Y-%m-%d", 0, 0, 1, 1, localtime->year(), 0, 0, -1);
-    my $oldfirst = strftime("%Y-%m-%d", 0, 0, 1, 1, localtime->year()-1, 0, 0, -1);
+    my $firstjan = strftime("%Y-%m-%d", 0, 0, 0, 1, 0, localtime->year(), 0, 0, -1);
+    my $oldfirst = strftime("%Y-%m-%d", 0, 0, 0, 1, 0, localtime->year()-1, 0, 0, -1);
+    pb_log(2,"firstjan: $firstjan, oldfirst: $oldfirst, pbdate:$pbdate\n");
     my $all = $dbh->selectall_arrayref("SELECT id,date,announce FROM announces ORDER BY date DESC");
     my %news;
@@ -2182 +2185 @@
     foreach my $row (@$all) {
         my ($id, $date, $announce) = @$row;
-        $news{"cy"} = $news{"cy"}."<p><B>$date</B> $announce\n" if (("$date" le $pbdate) && ($firstjan le "$date"));
-        $news{"ly"} = $news{"ly"}."<p><B>$date</B> $announce\n" if (("$date" le $firstjan) && ($oldfirst le "$date"));
-        $news{"py"} = $news{"py"}."<p><B>$date</B> $announce\n" if ("$date" le $oldfirst);
+        $news{"cy"} = $news{"cy"}."<p><B>$date</B> $announce\n" if ((($date cmp $pbdate) le 0) && (($firstjan cmp $date) le 0));
+        $news{"ly"} = $news{"ly"}."<p><B>$date</B> $announce\n" if ((($date cmp $firstjan) le 0) && (($oldfirst cmp $date) le 0));
+        $news{"py"} = $news{"py"}."<p><B>$date</B> $announce\n" if (($date cmp $oldfirst) le 0);
         $news{"fp"} = $news{"fp"}."<p><B>$date</B> $announce\n" if ($cpt > 0);
         $cpt--;

pbconf/devel/project-builder/rpm/project-builder.spec

@@ -3 +3 @@
 #
 %define perlvendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
-%define srcname   PBPKG
+%define srcname PBPKG
 
 Summary:    Project Builder aka pb is a tool to produce packages for multiple distributions