Changeset 1218 in ProjectBuilder for devel/pb

Timestamp:

Feb 24, 2011, 10:34:06 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix #86 (ndoualot) - error in hash test sources should be used and not patches.
• Improve tmout management again using pb_distro_get_param

Location:

devel/pb

Files:

• bin/pb (modified) (3 diffs)
• lib/ProjectBuilder/Filter.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -1512 +1512 @@
     my $conf = "sshconf";
     my $tmout = undef;
+    my $tm = undef;
     my $path = undef;
     if ($cmt =~ /^VM/) {
@@ -1615 +1616 @@
     }
     if ($cmt =~ /^(V|R)M/) {
-        ($vtmout) = pb_conf_get_if($tmout);
+        $vtmout = pb_distro_get_param($pbos,pb_conf_get_if($tmout));
     }
     my $remhost = $sshhost->{$ENV{'PBPROJ'}};
@@ -1847 +1848 @@
     my $tm = "";
     if ($cmt =~ /^(V|R)M/) {
-        $tm = "sleep $vtmout->{$v}" if (defined $vtmout);
+        $tm = "sleep $vtmout" if (defined $vtmout);
     }
 

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -203 +203 @@
             pb_log(3,"DEBUG($tuple) filtering PBMULTISRC\n");
             my $i = 1;
-            if (defined $pb->{'patches'}->{$tuple}) {
+            if (defined $pb->{'sources'}->{$tuple}) {
                 foreach my $p (split(/,/,$pb->{'sources'}->{$tuple})) {
                     pb_log(3,"DEBUG($tuple) Adding source $i ".basename($p)."\n");