Commit ca886cec authored by Nicolas Boulenguez's avatar Nicolas Boulenguez

Prepare upload of 1.4.3-5 to unstable.

* Handle API change in python-lockfile 0.9. Closes: 789565.
* Make build-dependency on dh-python explicit.
parent a1b00c4e
taskcoach (1.4.3-5) unstable; urgency=medium
* twisted-version-compare.diff: allow string minor version. Closes: 877029.
* Handle API change in python-lockfile 0.9. Closes: 789565.
* Make build-dependency on dh-python explicit.
* Standards-Version: 4.1.1.
-- Nicolas Boulenguez <nicolas@debian.org> Mon, 23 Oct 2017 21:05:34 +0200
taskcoach (1.4.3-4) unstable; urgency=medium
* Disable parallel execution of upstream Makefile.
......
......@@ -5,13 +5,14 @@ Maintainer: Nicolas Boulenguez <nicolas@debian.org>
Build-Depends-Indep: debhelper (>= 10),
# 2.6.6-3~: https://wiki.debian.org/Python/TransitionToDHPython2
python (>= 2.6.6-3~),
dh-python,
# See debian/rules:
graphicsmagick,
# Unit tests have the same dependencies than the installed package.
python-chardet (>= 2.1.1),
python-dateutil (>= 1.5),
python-keyring (>= 3.7),
python-lockfile (>= 0.8),
python-lockfile (>= 0.9),
python-pyparsing (>= 1.5.5),
python-squaremap (>= 1.0.3),
python-xdg (>= 0.25),
......@@ -37,7 +38,7 @@ Depends: ${misc:Depends}, ${python:Depends},
python-chardet (>= 2.1.1),
python-dateutil (>= 1.5),
python-keyring (>= 3.7),
python-lockfile (>= 0.8),
python-lockfile (>= 0.9),
python-pyparsing (>= 1.5.5),
python-squaremap (>= 1.0.3),
python-xdg (>= 0.25),
......
Description: Import installed lockfile instead of thirdparty/.
See debian/copyright.
.
The Makefile later patches lockfile.py,
so we only copy it into taskcoachlib/thirdparty.
Also handle trivial API change in lockfile 0.9.
Author: Nicolas Boulenguez <nicolas@debian.org>
Forwarded: not-needed
......@@ -34,10 +32,21 @@ Forwarded: not-needed
from taskcoachlib.syncml.config import createDefaultSyncConfig
from taskcoachlib.thirdparty.guid import generate
-from taskcoachlib.thirdparty import lockfile
+import lockfile
+import lockfile.mkdirlockfile
from taskcoachlib.changes import ChangeMonitor, ChangeSynchronizer
from taskcoachlib.filesystem import FilesystemNotifier, FilesystemPollerNotifier
from wx.lib.pubsub import pub
@@ -620,8 +620,8 @@
if operating_system.isWindows() and self.__isCloud(filename):
return DummyLockFile()
if self.__isFuse(filename):
- return lockfile.MkdirFileLock(filename)
- return lockfile.FileLock(filename)
+ return lockfile.mkdirlockfile.MkdirLockFile(filename)
+ return lockfile.LockFile(filename)
def is_locked(self):
return self.__lock and self.__lock.is_locked()
--- a/tests/unittests/guiTests/IOControllerTest.py
+++ b/tests/unittests/guiTests/IOControllerTest.py
@@ -18,7 +18,7 @@
......@@ -51,7 +60,7 @@ Forwarded: not-needed
import shutil
--- a/tests/unittests/thirdPartySoftwareTests/LockFileTest.py
+++ b/tests/unittests/thirdPartySoftwareTests/LockFileTest.py
@@ -18,7 +18,7 @@
@@ -18,13 +18,13 @@
from __future__ import with_statement
import test, tempfile
......@@ -60,3 +69,19 @@ Forwarded: not-needed
class LockFileTest(test.TestCase):
def setUp(self):
self.tmpfile = tempfile.NamedTemporaryFile()
- self.lock = lockfile.FileLock(self.tmpfile.name)
+ self.lock = lockfile.LockFile(self.tmpfile.name)
def tearDown(self):
super(LockFileTest, self).tearDown()
@@ -45,7 +45,7 @@
def testLockingTwoFiles(self):
self.lock.acquire()
tmpfile2 = tempfile.NamedTemporaryFile()
- lock2 = lockfile.FileLock(tmpfile2.name)
+ lock2 = lockfile.LockFile(tmpfile2.name)
lock2.acquire()
self.failUnless(self.lock.is_locked())
self.failUnless(lock2.is_locked())
# Upstream does not consider this an emergency.
debian-watch-may-check-gpg-signature
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment