- check if /var/log/archive is symlink (could have been made by hand earlier);

  if so, rename it and proceed as there was no archive directory at all

Changed files:
    logrotate.spec -> 1.89

diff --git a/logrotate.spec b/logrotate.spec
index bf763e55102e520f57e67482b50aa6e74b559a71..1869243f142ce823d060a69e14c9a593d3285c7a 100644 (file)
--- a/logrotate.spec
+++ b/logrotate.spec
@@ -138,15 +138,19 @@ rm -rf $RPM_BUILD_ROOT
 if [ ! -L /var/log/archiv ]; then
        if [ -d /var/log/archiv ]; then
                if [ -d /var/log/archive ]; then
-                       mv /var/log/archiv/* /var/log/archive
-                       rmdir /var/log/archiv 2>/dev/null || mv -v /var/log/archiv{,.rpmsave}
+                       if [ ! -L /var/log/archive ]; then
+                               mv /var/log/archiv/* /var/log/archive
+                               rmdir /var/log/archiv 2>/dev/null || mv -v /var/log/archiv{,.rpmsave}
+                       else
+                               mv -v /var/log/archive{,.rpmsave}
+                               mv /var/log/archiv /var/log/archive
+                       fi
                else
                        mv /var/log/archiv /var/log/archive
                fi
        fi
 
        # always have archiv symlink (until all packages from Ac use new dir)
-       install -d /var/log
        ln -s archive /var/log/archiv
 fi
 exit 0