[arch-commits] Commit in deluge/trunk (PKGBUILD fs31433.patch)

[Jan Steffens]

    Date: Wednesday, October 24, 2012 @ 00:20:00
  Author: heftig
Revision: 169592

Fix FS#31433; fix directory permissions

Added:
  deluge/trunk/fs31433.patch
Modified:
  deluge/trunk/PKGBUILD

---------------+
 PKGBUILD      |   14 ++++++++++----
 fs31433.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-24 01:48:33 UTC (rev 169591)
+++ PKGBUILD	2012-10-24 04:20:00 UTC (rev 169592)
@@ -5,7 +5,7 @@
 
 pkgname=deluge
 pkgver=1.3.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server model"
 arch=('any')
 url="http://deluge-torrent.org/"
@@ -21,17 +21,23 @@
 backup=(etc/conf.d/deluged)
 install=deluge.install
 source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.bz2
-        deluge.tmpfiles.conf deluged deluge-web deluged.service deluge-web.service deluged.conf)
+        deluge.tmpfiles.conf deluged deluge-web deluged.service deluge-web.service deluged.conf
+        fs31433.patch)
 md5sums=('f17ef6686f33e12694b44976e5ed7721'
          'c50385d32a2db0ef3f46b8caadb0e988'
          '443690c730263b76a465dc413f695a86'
          '37538a1b049b177e9ea1014331e29689'
          '6b831c889f365f58317dc4b78c167a62'
          'b3fff6601a5971bba89fa9a85dcf9ce8'
-         '71d556cf7ce3bb59391797827347e80c')
+         '71d556cf7ce3bb59391797827347e80c'
+         '65311330bd87440c50f2bb7251f46fcd')
 
 build() {
   cd $pkgname-$pkgver
+
+  # Fix moving to storage (FS#31433)
+  patch -Np1 -i ../fs31433.patch
+
   python2 setup.py build
 }
 
@@ -52,5 +58,5 @@
   install -Dm644 deluged.conf "$pkgdir/etc/conf.d/deluged"
  
   install -d "$pkgdir/srv"
-  install -d -m 664 -o 125 -g 125 "$pkgdir/srv/deluge"
+  install -d -m 775 -o 125 -g 125 "$pkgdir/srv/deluge"
 }

Added: fs31433.patch
===================================================================
--- fs31433.patch	                        (rev 0)
+++ fs31433.patch	2012-10-24 04:20:00 UTC (rev 169592)
@@ -0,0 +1,29 @@
+diff -u -Nr deluge-1.3.5/deluge/core/torrent.py deluge-1.3.5-fs31433/deluge/core/torrent.py
+--- deluge-1.3.5/deluge/core/torrent.py	2012-04-10 03:53:16.000000000 +0200
++++ deluge-1.3.5-fs31433/deluge/core/torrent.py	2012-10-24 06:14:05.838480957 +0200
+@@ -834,14 +834,17 @@
+     def move_storage(self, dest):
+         """Move a torrent's storage location"""
+ 
+-        # Attempt to convert utf8 path to unicode
+-        # Note: Inconsistent encoding for 'dest', needs future investigation
+-        try:
+-           dest_u = unicode(dest, "utf-8")
+-        except TypeError:
+-           # String is already unicode
+-           dest_u = dest
+-
++        if deluge.common.windows_check():
++            # Attempt to convert utf8 path to unicode
++            # Note: Inconsistent encoding for 'dest', needs future investigation
++            try:
++               dest_u = unicode(dest, "utf-8")
++            except TypeError:
++               # String is already unicode
++               dest_u = dest
++        else:
++            dest_u = dest
++            
+         if not os.path.exists(dest_u):
+             try:
+                 # Try to make the destination path if it doesn't exist