Changeset 899 in ProjectBuilder

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)

Files:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)
• devel/pb/bin/pb (modified) (2 diffs)
• projects/qemu/.pbrc (modified) (1 diff)

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

devel/pb/bin/pb

@@ -925 +925 @@
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
-                    pb_distro_installdeps("$f",$dtype,$pbupd);
+                    pb_distro_installdeps($f,$dtype,$pbupd);
                     pb_system("rpmbuild $specialdef --define \'packager $ENV{'PBPACKAGER'}\' --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}","verbose");
                     last;
@@ -1004 +1004 @@
             foreach my $f (@ebuildfile) {
                 if ($f =~ /\.ebuild$/) {
-                    pb_distro_installdeps("$f",$dtype,$pbupd);
+                    pb_distro_installdeps($f,$dtype,$pbupd);
                     move($f,"$tmpd/$pbpkg-$pbver.ebuild");
                     pb_system("cd $tmpd ; ebuild $pbpkg-$pbver.ebuild clean ; ebuild $pbpkg-$pbver.ebuild digest ; ebuild $pbpkg-$pbver.ebuild package","verbose");

projects/qemu/.pbrc

@@ -14 +14 @@
 vmlogin default = pb
 vmport default = 2222
+vmport pb = 2223
 vmmonport default = 4444