[Tools 2/3] testbot/WineRun*: Simplify umask handling in the WineRun* scripts.
Francois Gouget
fgouget at codeweavers.com
Sun Jan 8 17:56:52 CST 2017
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
testbot/bin/WineRunBuild.pl | 3 +--
testbot/bin/WineRunReconfig.pl | 3 +--
testbot/bin/WineRunTask.pl | 6 ++----
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index 07572479..119b988d 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -180,15 +180,14 @@ sub LogTaskError($)
my $OldUMask = umask(002);
if (open(my $ErrFile, ">>", $FullErrFileName))
{
- umask($OldUMask);
print $ErrFile $ErrMessage;
close($ErrFile);
}
else
{
- umask($OldUMask);
Error "Unable to open '$FullErrFileName' for writing: $!\n";
}
+ umask($OldUMask);
}
sub WrapUpAndExit($)
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 2c8e2fb7..1bc5c4cf 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -180,15 +180,14 @@ sub LogTaskError($)
my $OldUMask = umask(002);
if (open(my $ErrFile, ">>", $FullErrFileName))
{
- umask($OldUMask);
print $ErrFile $ErrMessage;
close($ErrFile);
}
else
{
- umask($OldUMask);
Error "Unable to open '$FullErrFileName' for writing: $!\n";
}
+ umask($OldUMask);
}
sub WrapUpAndExit($)
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index 875213bd..c3260bc1 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -68,15 +68,14 @@ sub TakeScreenshot($$)
my $OldUMask = umask(002);
if (open SCREENSHOT, ">$FullScreenshotFileName")
{
- umask($OldUMask);
print SCREENSHOT $ImageBytes;
close SCREENSHOT;
}
else
{
- umask($OldUMask);
Error "Can't save screenshot: $!\n";
}
+ umask($OldUMask);
}
else
{
@@ -207,15 +206,14 @@ sub LogTaskError($)
my $OldUMask = umask(002);
if (open(my $ErrFile, ">>", $FullErrFileName))
{
- umask($OldUMask);
print $ErrFile $ErrMessage;
close($ErrFile);
}
else
{
- umask($OldUMask);
Error "Unable to open '$FullErrFileName' for writing: $!\n";
}
+ umask($OldUMask);
}
sub WrapUpAndExit($;$)
--
2.11.0
More information about the wine-patches
mailing list