Changeset 1653 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

Oct 7, 2012, 8:20:14 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Red Hat 6.2 doesn't really support rpm --whaprovides so removing it for this one

File:

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

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

@@ -450 +450 @@
     next if $p =~ /^\s*$/o;
     if ($pbos->{'type'} eq  "rpm") {
-        my $res = pb_system("rpm -q --whatprovides --quiet $p","Looking for $p","mayfail");
+        my $rpmcmd = "rpm -q --whatprovides --quiet";
+        # whatprovides doesn't work for RH6.2
+        $rpmcmd = "rpm -q --quiet" if (($pbos->{'name'} eq "redhat") && ($pbos->{'version'} =~ /6/));
+        my $res = pb_system("$rpmcmd $p","Looking for $p","mayfail");
         next if ($res eq 0);
         pb_log(1, "INFO: missing dependency $p\n");