Changeset 1102 in ProjectBuilder

Timestamp:

Nov 10, 2010, 1:52:09 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix sbx2ssh call
• Improve yum-arch call

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pb/bin/pb (modified) (3 diffs)

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

@@ -180 +180 @@
             ($release) = $tmp =~ m/$distro_match->{$d}/m;
         } else {
-            print STDERR "Unable to find $d version in $r\n";
+            print STDERR "Unable to find $d version in $r (non-ambiguous)\n";
             print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
             $release = "unknown";
@@ -215 +215 @@
         }
         if ($found == 0) {
-            print STDERR "Unable to find $d version in $r\n";
+            print STDERR "Unable to find $d version in $r (ambiguous)\n";
             print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
             $release = "unknown";

devel/pb/bin/pb

@@ -482 +482 @@
     pb_cms2build("CMS");
     pb_build2ssh();
-} elsif ($action =~ /^sbxs2ssh$/) {
+} elsif ($action =~ /^sbx2ssh$/) {
     pb_cms2build("SandBox");
     pb_build2ssh();
@@ -1314 +1314 @@
     # Not mandatory...
     my ($rbsconf,$testver,$delivery) = pb_conf_get_if($conf,"testver","delivery");
+    $delivery->{$ENV{'PBPROJ'}} = "" if (not defined $delivery->{$ENV{'PBPROJ'}});
     my ($vtmout,$vepath);
     # ...Except those in virtual context
@@ -1377 +1378 @@
 rm -rf headers/ repodata/
 # Create yum repo
-yum-arch .
+if [ -x /usr/bin/yum-arch ]; then
+    yum-arch .
+fi
 # Create repodata
 createrepo .