[kde-doc-english] [kservice] /: KBuildSycoca: remove writing of the ksycoca5stamp file.

David Faure faure at kde.org
Fri Sep 18 08:08:37 UTC 2015


Git commit b83f4d76e2ae5d53a075d6c28da33b8a050605b7 by David Faure.
Committed on 17/09/2015 at 13:25.
Pushed by dfaure into branch 'master'.

KBuildSycoca: remove writing of the ksycoca5stamp file.

The code for reading it was already removed as part of b0c8fd8e64f,
the removal of the --checkstamps option.

The feature still exists anyway, a timestamp of "at least everything until
that time is in the DB" is in the sycoca header, and it used by the timestamp
check in ksycoca.cpp. This was an unnecessary separate file.

REVIEW: 125274

M  +2    -9    docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook
M  +1    -13   src/sycoca/kbuildsycoca.cpp

http://commits.kde.org/kservice/b83f4d76e2ae5d53a075d6c28da33b8a050605b7

diff --git a/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook b/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook
index 3419e42..d7f8581 100644
--- a/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook
+++ b/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook
@@ -24,8 +24,8 @@
 </affiliation>
 </author>
 
-<date>2014-04-12</date>
-<releaseinfo>Frameworks 5.0</releaseinfo>
+<date>2015-09-17</date>
+<releaseinfo>Frameworks 5.15</releaseinfo>
 <productname>KDE Frameworks</productname>
 
 </refentryinfo>
@@ -172,13 +172,6 @@ Show version information.
 is typically <filename class="directory"><envar>XDG_CONFIG_HOME</envar></filename></para>
 </listitem>
 </varlistentry>
-<varlistentry>
-<term><filename><varname>cachedir</varname>/ksycoca5stamp</filename></term>
-<listitem>
-<para>The timestamp and other meta-information about the main cache file.  On Unix systems, <varname>cachedir</varname> 
-is typically <filename class="directory"><envar>XDG_CONFIG_HOME</envar></filename></para>
-</listitem>
-</varlistentry>
 </variablelist>
 </refsect1>
 
diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
index a009d62..29c7638 100644
--- a/src/sycoca/kbuildsycoca.cpp
+++ b/src/sycoca/kbuildsycoca.cpp
@@ -457,19 +457,7 @@ bool KBuildSycoca::recreate(bool incremental)
         qDebug() << "Database is up to date";
     }
 
-    if (!m_globalDatabase) {
-        // update the timestamp file
-        QString stamppath = path + QStringLiteral("stamp");
-        QFile ksycocastamp(stamppath);
-        ksycocastamp.open(QIODevice::WriteOnly);
-        QDataStream str(&ksycocastamp);
-        str.setVersion(QDataStream::Qt_5_3);
-        str << m_newTimestamp;
-        str << existingResourceDirs();
-        if (m_vfolder) {
-            str << m_vfolder->allDirectories();    // Extra resource dirs
-        }
-    } else {
+    if (m_globalDatabase) {
         // These directories may have been created with 0700 permission
         // better delete them if they are empty
         QString appsDir = QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation);


More information about the kde-doc-english mailing list