Changeset 1102


Ignore:
Timestamp:
Nov 10, 2010, 1:52:09 AM (8 years ago)
Author:
bruno
Message:
  • Fix sbx2ssh call
  • Improve yum-arch call
Location:
devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r1071 r1102  
    180180            ($release) = $tmp =~ m/$distro_match->{$d}/m;
    181181        } else {
    182             print STDERR "Unable to find $d version in $r\n";
     182            print STDERR "Unable to find $d version in $r (non-ambiguous)\n";
    183183            print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
    184184            $release = "unknown";
     
    215215        }
    216216        if ($found == 0) {
    217             print STDERR "Unable to find $d version in $r\n";
     217            print STDERR "Unable to find $d version in $r (ambiguous)\n";
    218218            print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
    219219            $release = "unknown";
  • devel/pb/bin/pb

    r1098 r1102  
    482482    pb_cms2build("CMS");
    483483    pb_build2ssh();
    484 } elsif ($action =~ /^sbxs2ssh$/) {
     484} elsif ($action =~ /^sbx2ssh$/) {
    485485    pb_cms2build("SandBox");
    486486    pb_build2ssh();
     
    13141314    # Not mandatory...
    13151315    my ($rbsconf,$testver,$delivery) = pb_conf_get_if($conf,"testver","delivery");
     1316    $delivery->{$ENV{'PBPROJ'}} = "" if (not defined $delivery->{$ENV{'PBPROJ'}});
    13161317    my ($vtmout,$vepath);
    13171318    # ...Except those in virtual context
     
    13771378rm -rf headers/ repodata/
    13781379# Create yum repo
    1379 yum-arch .
     1380if [ -x /usr/bin/yum-arch ]; then
     1381    yum-arch .
     1382fi
    13801383# Create repodata
    13811384createrepo .
Note: See TracChangeset for help on using the changeset viewer.