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

Timestamp:

Jan 14, 2009, 1:47:26 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Improves SuSE 11.1 build
• Improves ntp handling in VMs (depending on distro)
• Removes > version deps type at the end of line also

File:

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

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

@@ -106 +106 @@
     $dtype="rpm";
     $dsuf=".$ddir$dver";
-    $dupd="export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo yast2 -y ";
+    $dupd="export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo yast2 -i ";
 } elsif (($ddir =~ /redhat/) ||
         ($ddir =~ /rhel/) ||
@@ -412 +412 @@
     pb_log(2,"found deps: $_\n");
     s/$regexp/$1/;
-    # Remove conditions
-    s/>[=]*.*,//g;
+    # Remove conditions in the middle and at the end
+    s/[><=]+.*,/,/g;
+    s/[><=]+.*$//g;
     # Improve string format (remove , and spaces at start, end and in double
-    s/,//g;
+    s/,/ /g;
     s/^\s*//;
     s/\s*$//;