[SCM] QCA2 library packaging branch, kubuntu_unstable, updated. debian/2.0.3-6-34-g1b7e588
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Thu Dec 18 13:25:57 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca2.git;a=commitdiff;h=1b7e588
The following commit has been merged in the kubuntu_unstable branch:
commit 1b7e58887d05fc0ac019385bf51cb283b753232e
Author: Harald Sitter <sitter at kde.org>
Date: Thu Dec 18 14:25:45 2014 +0100
apply a possible fix for flaky test on launchpad
---
debian/patches/kubuntu_temporary_qdebug_watch.diff | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/debian/patches/kubuntu_temporary_qdebug_watch.diff b/debian/patches/kubuntu_temporary_qdebug_watch.diff
index d6e5969..9f6c45f 100644
--- a/debian/patches/kubuntu_temporary_qdebug_watch.diff
+++ b/debian/patches/kubuntu_temporary_qdebug_watch.diff
@@ -10,7 +10,7 @@ Index: qca/src/support/dirwatch.cpp
#include <QFileSystemWatcher>
#include <QFileInfo>
#include <QDir>
-@@ -193,25 +194,31 @@ public:
+@@ -193,25 +194,42 @@ public:
private slots:
void dir_changed(const QString &path)
{
@@ -35,9 +35,21 @@ Index: qca/src/support/dirwatch.cpp
+ qDebug() << Q_FUNC_INFO << path;
Q_UNUSED(path);
QFileInfo fi(filePath);
+- if(!fi.exists())
+ qDebug() << Q_FUNC_INFO << "exists" << fi.exists();
- if(!fi.exists())
++ if(!fi.exists() && !fileExisted) {
++ // Got a file changed signal on a file that does not exist
++ // and is not actively watched. This happens when we
++ // previously watched a file but it was deleted and after
++ // the original deletion changed-signal we get another one
++ // (for example because of bad signal timing). In this scenario
++ // we must ignore the change as the change, whatever it may
++ // have been, is of no interest to us because we don't watch
++ // the file and furthermore the file does not even exist.
++ return;
++ } else if(!fi.exists()) {
fileExisted = false;
++ }
+ qDebug() << Q_FUNC_INFO << "emitting signal";
emit q->changed();
}
--
QCA2 library packaging
More information about the pkg-kde-commits
mailing list