Changeset 1604 in ProjectBuilder for devel/pb/bin

Timestamp:

May 27, 2012, 4:45:34 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix an error in the Package file generation for deb repo
• more pbtest fine tune
• Review again pb_system msgs

File:

• devel/pb/bin/pb (modified) (5 diffs)

devel/pb/bin/pb

@@ -1578 +1578 @@
                 next unless (/^Source: (\S+)/o);
                 my $tmp = $1;
-                $made = "$made $tmp"."_*.dsc $tmp"."_*.tar.gz $tmp"."_*.deb $tmp"."_*.changes";
+                $made = "$made $tmp"."_*.dsc $tmp"."_*.tar.gz $tmp"."_*.changes";
                 #doesn't work in my case
                 #foreach my $glob (("$1\_*.changes", "$1\_*.dsc", "$1\_*.tar.gz")) {
@@ -1783 +1783 @@
             $made2 .= "$f " if ($f =~ /\.deb$/);
         }
-        if (-x $chkcmd) {
+        if ((defined  $chkcmd) && (-x $chkcmd)) {
             my $ret = pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","mayfail");
             pb_log(0,"ERROR: when checking packages validity\n") if ($ret ne 0);
@@ -1976 +1976 @@
     $delivery->{$ENV{'PBPROJ'}} = "" if (not defined $delivery->{$ENV{'PBPROJ'}});
     my ($sshlogin,$sshport) = pb_conf_get_if($login,$port);
-    $sshport->{$ENV{PBPROJ}} = 22 unless (defined $sshport->{$ENV{PBPROJ}});
-    $sshlogin->{$ENV{PBPROJ}} = getpwuid($UID) unless (defined $sshlogin->{$ENV{PBPROJ}});
+    $sshport->{$ENV{PBPROJ}} = 22 if (not defined $sshport->{$ENV{PBPROJ}});
+    $sshlogin->{$ENV{PBPROJ}} = getpwuid($UID) if (not defined $sshlogin->{$ENV{PBPROJ}});
     my ($vtmout,$vepath);
     # ...Except those in virtual context
@@ -2202 +2202 @@
     arch=`basename \$i | sed 's/binary-//'`
     echo "Packages for \$arch:"
-    dpkg-scanpackages -a\$arch $pbos->{'version'} /dev/null | dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages
+    dpkg-scanpackages -a\$arch $pbos->{'version'} /dev/null > dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages
     gzip -9 < dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages > dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages.gz
     bzip2 -9 < dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages > dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages.bz2
@@ -2312 +2312 @@
     } else {
         my $keyfile = pb_ssh_get(0);
-        my $keyopt = defined $keyfile ? "-i $keyfile" : "";
+        my $keyopt = "";
+        $keyopt = "-i $keyfile" if ((defined $keyfile) && ($cmt !~ /Packages/));
         my $sshcmd = pb_check_req("ssh",1);
         my $scpcmd = pb_check_req("scp",1);