Changeset 1486 in ProjectBuilder

Timestamp:

Apr 25, 2012, 1:47:22 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb_mkdir_p now returns the return value of mkpath
• Do not point onto Cauldron anymore for Mageia chroots

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Base.pm (modified) (2 diffs)
• pb/bin/pb (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -375 +375 @@
 # pbos->{'arch'} == i586 for i386 repo
 rbsmirrorsrv mandriva = http://mirrors.kernel.org/mandriva/Mandrakelinux/official/$pbos->{'version'}/$pbos->{'arch'}/media/main/release/
-rbsmirrorsrv mageia = http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/$pbos->{'arch'}/media/core/release/
+rbsmirrorsrv mageia = http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/$pbos->{'version'}/$pbos->{'arch'}/media/core/release/
 #rbsmirrorsrv debian = http://ftp.us.debian.org/debian/
 #rbsmirrorsrv ubuntu = http://us.releases.ubuntu.com/releases/

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

@@ -108 +108 @@
 my @dir = @_;
 my $ret = mkpath(@dir, 0, 0755);
-return(0);
+return($ret);
 }
 
@@ -127 +127 @@
 =item B<pb_system>
 
-Encapsulate the "system" call for better output and return value test
-Needs a $ENV{'PBTMP'} variable which is created by calling the pb_mktemp_init function
-Needs pb_log support, so pb_log_init should have benn called before.
-
-The first parameter is the shell command to call. this commend should NOT use redirections.
+Encapsulate the "system" call for better output and return value test.
+Needs a $ENV{'PBTMP'} variable which is created by calling the pb_mktemp_init function.
+Needs pb_log support, so pb_log_init should have been called before.
+
+The first parameter is the shell command to call. This command should NOT use redirections.
 The second parameter is the message to print on screen. If none is given, then the command is printed.
-The third parameter print the result of the command after correct execution if value is verbose. If value is noredir, it avoids redirecting outputs (e.g. for vi).
-This function returns the result the return value of the system command.
+The third parameter print the result of the command after correct execution if value is verbose. If value is noredir, it avoids redirecting outputs (e.g. for vi). If value is quiet, doesn't print anything at all.
+This function returns as a result the return value of the system command.
 
 If no error reported, it prints OK on the screen, just after the message. Else it prints the errors generated.

devel/pb/bin/pb

@@ -3784 +3784 @@
 # If not mandatory return now
 return() if (($res != 0) and (($mandatory eq "patch") || ($mandatory eq "src")));
-opendir(DIR,"$dir") || die "Unable to open directory $dir";
+opendir(DIR,"$dir") || die "Unable to open directory $dir: $!";
 foreach my $f (readdir(DIR)) {
     next if ($f =~ /^\./);