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

Timestamp:

Nov 20, 2009, 2:00:28 AM (14 years ago)

Author:

Bruno Cornec

Message:

r3617@localhost: bruno | 2009-11-15 13:33:01 +0100
Improve case where the build file description if undef (seen in cms2vm)

File:

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

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

@@ -242 +242 @@
 
 # Get dependecies in the build file if not forced
-$deps = pb_distro_getdeps("$f", $dtype) if (not defined $deps);
+$deps = pb_distro_getdeps($f, $dtype) if (not defined $deps);
 pb_log(2,"deps: $deps\n");
 return if ((not defined $deps) || ($deps =~ /^\s*$/));
@@ -267 +267 @@
 my $sep = $/;
 
-pb_log(3,"entering pb_distro_getdeps: $dtype - $f\n");
 # Protection
 return("") if (not defined $dtype);
+return("") if (not defined $f);
+
+pb_log(3,"entering pb_distro_getdeps: $dtype - $f\n");
 if ($dtype eq  "rpm") {
     # In RPM this could include files, but we do not handle them atm.
@@ -283 +285 @@
 }
 pb_log(2,"regexp: $regexp\n");
-
-
-# Protection
-return("") if (not defined $f);
 
 # Preserve separator before using the one we need