Merge lp:~mardy/ubuntu-system-settings-online-accounts/stale-hooks-1596478 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Read time from symlink file, not target

It looks like click does not updates the time of installed files when upgrading a click package. QFileInfo::lastModified() method returns the time of the target file of a symlink, which causes our hooks not to detect a change.

Read time from symlink file, not target

It looks like click does not updates the time of installed files when upgrading a click package. QFileInfo::lastModified() method returns the time of the target file of a symlink, which causes our hooks not to detect a change.

=== modified file 'click-hooks/accounts.cpp'
--- click-hooks/accounts.cpp	2015-11-30 09:54:01 +0000
+++ click-hooks/accounts.cpp	2016-06-28 09:08:26 +0000
@@ -35,7 +35,9 @@
 #include <QStandardPaths>
 #include <QStringList>
 #include <click.h>
+#include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>
 #include <utime.h>
 #include "acl-updater.h"
 
@@ -624,6 +626,18 @@
     }
 }
 
+/* Get the modification time of a file; this differs from
+ * QFileInfo::lastModified() in that if the file is a symlink here we take the
+ * info from the symlink itself. */
+static QDateTime lastModified(const QFileInfo &fileInfo)
+{
+    struct stat data;
+    if (lstat(fileInfo.filePath().toUtf8().constData(), &data) < 0) {
+        return QDateTime();
+    }
+    return QDateTime::fromTime_t(data.st_mtime);
+}
+
 int main(int argc, char **argv)
 {
     QCoreApplication app(argc, argv);
@@ -678,7 +692,7 @@
          */
         QFileInfo processedInfo(fileInfo.filePath() + ".processed");
         if (processedInfo.exists() &&
-            processedInfo.lastModified() == fileInfo.lastModified()) {
+            processedInfo.lastModified() == lastModified(fileInfo)) {
             continue;
         }
 
@@ -694,7 +708,7 @@
                 file.close();
                 struct utimbuf sourceTime;
                 sourceTime.actime = sourceTime.modtime =
-                    fileInfo.lastModified().toTime_t();
+                    lastModified(fileInfo).toTime_t();
                 utime(processedInfo.filePath().toUtf8().constData(),
                       &sourceTime);
             } else {

=== modified file 'click-hooks/main.cpp'
--- click-hooks/main.cpp	2015-10-30 06:30:09 +0000
+++ click-hooks/main.cpp	2016-06-28 09:08:26 +0000
@@ -30,7 +30,9 @@
 #include <QStandardPaths>
 #include <QStringList>
 #include <click.h>
+#include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>
 #include <utime.h>
 
 static QString findPackageDir(const QString &appId)
@@ -82,6 +84,18 @@
     return components.join('_');
 }
 
+/* Get the modification time of a file; this differs from
+ * QFileInfo::lastModified() in that if the file is a symlink here we take the
+ * info from the symlink itself. */
+static QDateTime lastModified(const QFileInfo &fileInfo)
+{
+    struct stat data;
+    if (lstat(fileInfo.filePath().toUtf8().constData(), &data) < 0) {
+        return QDateTime();
+    }
+    return QDateTime::fromTime_t(data.st_mtime);
+}
+
 class LibAccountsFile: public QDomDocument {
 public:
     LibAccountsFile(const QFileInfo &hookFileInfo);
@@ -216,7 +230,7 @@
     if (ok) {
         struct utimbuf sourceTime;
         sourceTime.actime = sourceTime.modtime =
-            m_hookFileInfo.lastModified().toTime_t();
+            lastModified(m_hookFileInfo).toTime_t();
         utime(fileName.toUtf8().constData(), &sourceTime);
         return true;
     } else {
@@ -348,7 +362,7 @@
         QFileInfo destinationInfo(destination);
         /* If the destination is there and up to date, we have nothing to do */
         if (destinationInfo.exists() &&
-            destinationInfo.lastModified() == fileInfo.lastModified()) {
+            destinationInfo.lastModified() == lastModified(fileInfo)) {
             continue;
         }