From 4983a7bcf0dccc254376462ce3bd00df05306563 Mon Sep 17 00:00:00 2001 From: Max Kanat-Alexander Date: Sat, 20 Feb 2010 12:07:31 -0800 Subject: Bug 546871: Make checksetup.pl not try to fix the permissions of bugzilla-update.xml, to avoid warnings. r=LpSolit, a=LpSolit --- Bugzilla/Update.pm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'Bugzilla/Update.pm') diff --git a/Bugzilla/Update.pm b/Bugzilla/Update.pm index 292ab626e..489756406 100644 --- a/Bugzilla/Update.pm +++ b/Bugzilla/Update.pm @@ -34,18 +34,13 @@ sub get_notifications { # Update the local XML file if this one doesn't exist or if # the last modification time (stat[9]) is older than TIME_INTERVAL. if (!-e $local_file || (time() - (stat($local_file))[9] > TIME_INTERVAL)) { - # Are we sure we didn't try to refresh this file already - # but we failed because we cannot modify its timestamp? - my $can_alter = (-e $local_file) ? utime(undef, undef, $local_file) : 1; - if ($can_alter) { - unlink $local_file; # Make sure the old copy is away. - my $error = _synchronize_data(); - # If an error is returned, leave now. - return $error if $error; - } - else { - return {'error' => 'no_update', 'xml_file' => $local_file}; + unlink $local_file; # Make sure the old copy is away. + if (-e $local_file) { + return { error => 'no_update', xml_file => $local_file }; } + my $error = _synchronize_data(); + # If an error is returned, leave now. + return $error if $error; } # If we cannot access the local XML file, ignore it. -- cgit v1.2.3-24-g4f1b