Changeset 698

Timestamp:

02/18/09 13:47:34 (4 years ago)

Author:

bruno

Message:

• Tries to avoid an error msg on disconnect at end of announce by finishing session before
• Fix debian build deps computation (checked on lenny)

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• pb/bin/pb (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -412 +412 @@
     pb_log(2,"found deps: $_\n");
     s/$regexp/$1/i;
-    # Remove conditions in the middle and at the end
+    # Remove conditions in the middle and at the end for deb
+    s/\(\s*[><=]+.*\)\s*,/,/g;
+    s/\(\s*[><=]+.*$//g;
+    # Same for rpm
     s/[><=]+.*,/,/g;
     s/[><=]+.*$//g;

devel/pb/bin/pb

@@ -2346 +2346 @@
                     || die "Unable to insert into $db";
     $sth->execute($pbdate, $announce);
+    $sth->finish();
     $dbh->disconnect;