Changeset 1212 in ProjectBuilder

Timestamp:

Feb 21, 2011, 12:20:02 AM (13 years ago)

Author:

Bruno Cornec

Message:

• pb_mkdir_p doesn't return anything anymore. Test of return removed.
• Packages installed are not using really the install command not the update one.

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Base.pm (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pb/bin/pb (modified) (3 diffs)
• pb/lib/ProjectBuilder/Env.pm (modified) (7 diffs)

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

@@ -108 +108 @@
 my @dir = @_;
 my $ret = mkpath(@dir, 0, 0755);
-return($ret);
+return(0);
 }
 

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

@@ -302 +302 @@
 
 # Protection
-return if (not defined $pbos->{'update'});
+return if (not defined $pbos->{'install'});
 
 # Get dependencies in the build file if not forced
@@ -310 +310 @@
 if ($deps !~ /^[    ]*$/) {
     # This may not be // proof. We should test for availability of repo and sleep if not
-    pb_system("$pbos->{'update'} $deps","Installing dependencies ($deps)");
+    pb_system("$pbos->{'install'} $deps","Installing dependencies ($deps)");
     }
 }

devel/pb/bin/pb

@@ -1191 +1191 @@
     $pkg = { } if (not defined $pkg);
 
-    pb_mkdir_p("$ENV{'PBBUILDDIR'}") || die "Unable to create $ENV{'PBBUILDDIR'}";
+    pb_mkdir_p("$ENV{'PBBUILDDIR'}") if (! -d "$ENV{'PBBUILDDIR'}");
     chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
     my $made = ""; # pkgs made during build
@@ -1217 +1217 @@
             foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {
                 if (! -d "$ENV{'PBBUILDDIR'}/$d") {
-                pb_mkdir_p("$ENV{'PBBUILDDIR'}/$d") || die "Please ensure that you can write into $ENV{'PBBUILDDIR'} to create $d\nchown the $ENV{'PBBUILDDIR'} directory to your uid";
+                    pb_mkdir_p("$ENV{'PBBUILDDIR'}/$d");
                 }
             }
@@ -1558 +1558 @@
         $pkg = { } if (not defined $pkg);
 
-        pb_mkdir_p("$ENV{'PBBUILDDIR'}") || die "Unable to create $ENV{'PBBUILDDIR'}";
+        pb_mkdir_p("$ENV{'PBBUILDDIR'}") if (! -d "$ENV{'PBBUILDDIR'}");
         chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
         foreach my $pbpkg (@pkgs) {

devel/pb/lib/ProjectBuilder/Env.pm

@@ -255 +255 @@
         # svn import "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}" svn://repo
         # in case it doesn't exist there
-        pb_mkdir_p("$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}") || die "Unable to recursively create $ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}";
+        pb_mkdir_p("$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}");
     }
     pb_cms_add($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}");
@@ -283 +283 @@
 }
 if (! -d "$ENV{'PBDESTDIR'}") {
-    pb_mkdir_p($ENV{'PBDESTDIR'}) || die "Unable to recursively create $ENV{'PBDESTDIR'}";
+    pb_mkdir_p($ENV{'PBDESTDIR'});
 }
 
@@ -291 +291 @@
 $ENV{'PBBUILDDIR'}="$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/build";
 if (! -d "$ENV{'PBBUILDDIR'}") {
-    pb_mkdir_p($ENV{'PBBUILDDIR'}) || die "Unable to recursively create $ENV{'PBBUILDDIR'}";
+    pb_mkdir_p($ENV{'PBBUILDDIR'});
 }
 
@@ -549 +549 @@
             }
             close(CONF);
-            pb_mkdir_p("$ENV{'PBROOTDIR'}/pbfilter") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter";
+            pb_mkdir_p("$ENV{'PBROOTDIR'}/pbfilter");
             open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/all.pbf") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/all.pbf";
             print CONF << "EOF";
@@ -761 +761 @@
             close(CONF);
             foreach my $pp (@pkgs) {
-                pb_mkdir_p("$ENV{'PBROOTDIR'}/$pp/deb") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/deb";
+                pb_mkdir_p("$ENV{'PBROOTDIR'}/$pp/deb");
                 open(CONF,"> $ENV{'PBROOTDIR'}/$pp/deb/control") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/deb/control";
                 print CONF << "EOF";
@@ -979 +979 @@
 EOF
                 close(CONF);
-                pb_mkdir_p("$ENV{'PBROOTDIR'}/$pp/rpm") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/rpm";
+                pb_mkdir_p("$ENV{'PBROOTDIR'}/$pp/rpm");
                 open(CONF,"> $ENV{'PBROOTDIR'}/$pp/rpm/$pp.spec") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/rpm/$pp.spec";
                 print CONF << 'EOF';
@@ -1047 +1047 @@
 EOF
                 close(CONF);
-                pb_mkdir_p("$ENV{'PBROOTDIR'}/$pp/pbfilter") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/pbfilter";
-                pb_mkdir_p("$ENV{'PBROOTDIR'}/$pp/pkg") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/pkg";
+                pb_mkdir_p("$ENV{'PBROOTDIR'}/$pp/pbfilter");
+                pb_mkdir_p("$ENV{'PBROOTDIR'}/$pp/pkg");
                 open(CONF,"> $ENV{'PBROOTDIR'}/$pp/pkg/pkginfo") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/pkg/pkginfo";
                 print CONF << 'EOF';