[Midnightbsd-cvs] mports: Chroot.pm: Fix a bug in _mkdir.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Fri Sep 19 13:10:21 EDT 2008


Log Message:
-----------
Fix a bug in _mkdir. File::Path::path throws exceptions on error, its
return value in this case isn't what we need to check.

Modified Files:
--------------
    mports/Tools/lib/Magus:
        Chroot.pm (r1.26 -> r1.27)

-------------- next part --------------
Index: Chroot.pm
===================================================================
RCS file: /home/cvs/mports/Tools/lib/Magus/Chroot.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -L Tools/lib/Magus/Chroot.pm -L Tools/lib/Magus/Chroot.pm -u -r1.26 -r1.27
--- Tools/lib/Magus/Chroot.pm
+++ Tools/lib/Magus/Chroot.pm
@@ -244,8 +244,10 @@
 sub _clear_flags {
   my ($self, $dir) = @_;
   
-  system("/bin/chflags -R 0 $self->{root}$dir") == 0
-      or die "chflags 0 $self->{root}$dir returned non-zero: $?\n";  
+  my $cmd = "/bin/chflags -R 0 $self->{root}$dir";
+  
+  (system($cmd) == 0)
+      or die qq/"$cmd" returned non-zero: $?\n/;  
 }
   
 
@@ -257,9 +259,8 @@
 
 sub _mkdir {
   my ($self, $dir) = @_;
-  use Carp;
-  mkpath("$self->{root}/$dir") ||
-    croak "Couldn't mkdir $self->{root}/$dir: $!\n";
+  
+  mkpath("$self->{root}/$dir");
 }
 
 
@@ -386,8 +387,6 @@
 
 
 
-  
-
 1;
 __END__
 


More information about the Midnightbsd-cvs mailing list