Changeset 2189 in ProjectBuilder

Timestamp:

Mar 3, 2017, 4:07:35 AM (8 years ago)

Author:

Bruno Cornec

Message:

Fix a bug on the analysis of build dependencies for deb packages when using
multiple versions constraints

File:

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

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

@@ -331 +331 @@
 
 This function install the dependencies required to build the package on a distro.
-If $forcerepo is defined then do not assumer package are alredy installed, but reinstall them
+If $forcerepo is defined then do not assume packages are alredy installed, but reinstall them
 (useful if you add a repo which contains more up to date packages that you need)
 Dependencies can be passed as the 4th parameter in which case they are not computed
@@ -426 +426 @@
     pb_log(4,"found deps 1: $_\n");
     # Remove conditions in the middle and at the end for deb
-    s/\(\s*[><=]+.*\)[^,]*,/,/g;
+    s/\([><=]+[^,]*,/,/g;
     pb_log(4,"found deps 2: $_\n");
-    s/\(\s*[><=]+.*$//g;
+    s/\([><=]+[^,]*$//g;
     pb_log(4,"found deps 3: $_\n");
     # Same for rpm