Skip to content

C
core
Kaydet (Commit) 91907b04 authored tarafından Jordan Ayers's avatar Jordan Ayers Kaydeden (comit) Norbert Thiebaud
Dosyalara gözat
Seçenekler

Perl Installer: Use built-in chmod 

Replace system calls which performed single-file permission sets with calls to the built-in chmod.
Replace the implementation of create_directory with a call to create_directory_with_privileges.
üst b8fcb346
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 117 deletions
solenv/bin/modules/installer/systemactions.pm
Dosyayı görüntüle @ 91907b04
......@@ -43,108 +43,7 @@ sub create_directory
{
my ($directory) = @_;
my $returnvalue = 1;
my $infoline = "";
if (!(-d $directory))
{
$returnvalue = mkdir($directory, 0775);
if ($returnvalue)
{
$infoline = "\nCreated directory: $directory\n";
push(@installer::globals::logfileinfo, $infoline);
my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1";
system($localcall);
# chmod 0775 is not sufficient on mac to remove sticky tag
$localcall = "chmod a-s $directory \>\/dev\/null 2\>\&1";
system($localcall);
}
else
{
# New solution in parallel packing: It is possible, that the directory now exists, although it
# was not created in this process. There is only an important error, if the directory does not
# exist now.
$infoline = "\nDid not succeed in creating directory: \"$directory\". Further attempts will follow.\n";
push(@installer::globals::logfileinfo, $infoline);
if (!(-d $directory))
{
# Problem with parallel packaging? -> Try a little harder, before exiting.
# Did someone else remove the parent directory in the meantime?
my $parentdir = $directory;
installer::pathanalyzer::get_path_from_fullqualifiedname(\$parentdir);
if (!(-d $parentdir))
{
$returnvalue = mkdir($parentdir, 0775);
if ($returnvalue)
{
$infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n";
push(@installer::globals::logfileinfo, $infoline);
my $localcall = "chmod 775 $parentdir \>\/dev\/null 2\>\&1";
system($localcall);
}
else
{
$infoline = "\Error: \"$directory\" could not be created. Even the parent directory \"$parentdir\" does not exist and could not be created.\n";
push(@installer::globals::logfileinfo, $infoline);
if ( -d $parentdir )
{
$infoline = "\nAttention: Finally the parent directory \"$parentdir\" exists, but I could not create it.\n";
push(@installer::globals::logfileinfo, $infoline);
}
else
{
# Now it is time to exit, even the parent could not be created.
installer::exiter::exit_program("ERROR: Could not create parent directory \"$parentdir\"", "create_directory");
}
}
}
# At this point we have to assume, that the parent directory exist.
# Trying once more to create the desired directory
$returnvalue = mkdir($directory, 0775);
if ($returnvalue)
{
$infoline = "\nAttention: Created directory \"$directory\" in the second try.\n";
push(@installer::globals::logfileinfo, $infoline);
my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
system($localcall);
}
else
{
if ( -d $directory )
{
$infoline = "\nAttention: Finally the directory \"$directory\" exists, but I could not create it.\n";
push(@installer::globals::logfileinfo, $infoline);
}
else
{
# It is time to exit, even the second try failed.
installer::exiter::exit_program("ERROR: Failed to create the directory: $directory", "create_directory");
}
}
}
else
{
$infoline = "\nAnother process created this directory in exactly this moment :-) : $directory\n";
push(@installer::globals::logfileinfo, $infoline);
}
}
}
else
{
$infoline = "\nAlready existing directory, did not create: $directory\n";
push(@installer::globals::logfileinfo, $infoline);
}
create_directory_with_privileges( $directory, "755" );
}
######################################################
......@@ -157,10 +56,10 @@ sub create_directory_with_privileges
my $returnvalue = 1;
my $infoline = "";
my $localprivileges = oct("0".$privileges); # changes "777" to 0777
if (!(-d $directory))
{
my $localprivileges = oct("0".$privileges); # changes "777" to 0777
$returnvalue = mkdir($directory, $localprivileges);
if ($returnvalue)
......@@ -168,8 +67,7 @@ sub create_directory_with_privileges
$infoline = "\nCreated directory: $directory\n";
push(@installer::globals::logfileinfo, $infoline);
my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
system($localcall);
chmod $localprivileges, $directory;
}
else
{
......@@ -195,8 +93,7 @@ sub create_directory_with_privileges
$infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n";
push(@installer::globals::logfileinfo, $infoline);
my $localcall = "chmod $privileges $parentdir \>\/dev\/null 2\>\&1";
system($localcall);
chmod $localprivileges, $parentdir;
}
else
{
......@@ -225,8 +122,7 @@ sub create_directory_with_privileges
$infoline = "\nAttention: Created directory \"$directory\" in the second try.\n";
push(@installer::globals::logfileinfo, $infoline);
my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
system($localcall);
chmod $localprivileges, $directory;
}
else
{
......@@ -254,8 +150,7 @@ sub create_directory_with_privileges
$infoline = "\nAlready existing directory, did not create: $directory\n";
push(@installer::globals::logfileinfo, $infoline);
my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
system($localcall);
chmod $localprivileges, $directory;
}
}
......@@ -1443,12 +1338,7 @@ sub try_to_create_directory
$infoline = "\nCreated directory: $directory\n";
push(@installer::globals::logfileinfo, $infoline);
my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1";
system($localcall);
# chmod 0775 is not sufficient on mac to remove sticky tag
$localcall = "chmod a-s $directory \>\/dev\/null 2\>\&1";
system($localcall);
chmod 0775, $directory;
}
else
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment