[Python-apps-commits] r5971 - in packages/lottanzb/trunk/debian (5 files)

[lantash-guest at users.alioth.debian.org]

    Date: Sunday, August 8, 2010 @ 11:01:00
  Author: lantash-guest
Revision: 5971

Don't use a hardcoded name for the lock file. Instead, include the user name and use  (Closes: #587649).

Added:
  packages/lottanzb/trunk/debian/patches/
  packages/lottanzb/trunk/debian/patches/lock-file-name.patch
Modified:
  packages/lottanzb/trunk/debian/changelog
  packages/lottanzb/trunk/debian/control
  packages/lottanzb/trunk/debian/rules

Modified: packages/lottanzb/trunk/debian/changelog
===================================================================
--- packages/lottanzb/trunk/debian/changelog	2010-08-07 11:11:56 UTC (rev 5970)
+++ packages/lottanzb/trunk/debian/changelog	2010-08-08 11:01:00 UTC (rev 5971)
@@ -1,3 +1,13 @@
+lottanzb (0.5.4-2) unstable; urgency=low
+
+  * debian/control:
+    + Bump Standards-Version to 3.9.1.
+  * debian/patches/lock-file-name.patch:
+    + Don't use a hardcoded name for the lock file. Instead,
+      include the user name and use $TMP (Closes: #587649).
+
+ -- Severin Heiniger <severinheiniger at gmail.com>  Sat, 31 Jul 2010 09:24:22 +0200
+
 lottanzb (0.5.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/lottanzb/trunk/debian/control
===================================================================
--- packages/lottanzb/trunk/debian/control	2010-08-07 11:11:56 UTC (rev 5970)
+++ packages/lottanzb/trunk/debian/control	2010-08-08 11:01:00 UTC (rev 5971)
@@ -5,7 +5,7 @@
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: cdbs, debhelper (>= 5.0.51~), python, python-support
 Build-Depends-Indep: intltool
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/lottanzb/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/lottanzb/trunk
 Homepage: http://www.lottanzb.org/

Added: packages/lottanzb/trunk/debian/patches/lock-file-name.patch
===================================================================
--- packages/lottanzb/trunk/debian/patches/lock-file-name.patch	                        (rev 0)
+++ packages/lottanzb/trunk/debian/patches/lock-file-name.patch	2010-08-08 11:01:00 UTC (rev 5971)
@@ -0,0 +1,28 @@
+Make it possible for multiple users to run LottaNZB concurrently on the same
+machine and add support for non-standard locations of the temporary directory.
+diff -Nur -x '*.orig' -x '*~' 0.5/lottanzb/core.py 0.5.new/lottanzb/core.py
+--- 0.5/lottanzb/core.py	2010-05-18 20:52:29.000000000 +0200
++++ 0.5.new/lottanzb/core.py	2010-07-31 09:45:08.043820000 +0200
+@@ -15,6 +15,10 @@
+ 
+ import sys
+ 
++from os.path import join
++from getpass import getuser
++from tempfile import gettempdir
++
+ def die(message):
+     """
+     Try to display a message if the software requirements are not satisfied and
+@@ -84,7 +88,10 @@
+     
+     is_quitting = gproperty(type=bool, default=False)
+     _quitting_lock = Lock()
+-    _file_lock = FileLock("/tmp/lottanzb.lock")
++    
++    # Make it possible for multiple users to run LottaNZB concurrently on the
++    # same machine.
++    _file_lock = FileLock(join(gettempdir(), "lottanzb-%s.lock" % getuser()))
+     
+     debug = gproperty(type=bool, default=False)
+     

Modified: packages/lottanzb/trunk/debian/rules
===================================================================
--- packages/lottanzb/trunk/debian/rules	2010-08-07 11:11:56 UTC (rev 5970)
+++ packages/lottanzb/trunk/debian/rules	2010-08-08 11:01:00 UTC (rev 5971)
@@ -4,6 +4,7 @@
 
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 DEB_PYTHON_INSTALL_ARGS_ALL := --packaging-mode