From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Sat, 20 Feb 2010 20:08:38 +0000 (-0800)
Subject: Bug 546871: Make checksetup.pl not try to fix the permissions of
X-Git-Tag: bugzilla-3.6rc1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fac754df20333ca6fb47c0c3d84211b7da625dce;p=thirdparty%2Fbugzilla.git

Bug 546871: Make checksetup.pl not try to fix the permissions of
bugzilla-update.xml, to avoid warnings.
r=LpSolit, a=LpSolit
---

diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index 44c34718e4..4dc8a484d2 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -137,7 +137,6 @@ sub FILESYSTEM {
         'docs/style.css'       => { perms => $ws_readable },
         'docs/*/rel_notes.txt' => { perms => $ws_readable },
         'docs/*/README.docs'   => { perms => $owner_readable },
-        "$datadir/bugzilla-update.xml" => { perms => $ws_writeable },
         "$datadir/params" => { perms => $ws_writeable },
         "$datadir/old-params.txt" => { perms => $owner_readable },
         "$extensionsdir/create.pl" => { perms => $owner_executable },
diff --git a/Bugzilla/Update.pm b/Bugzilla/Update.pm
index 292ab626e1..4897564065 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.