Bugfixing update to zeya-0.6

This commit is contained in:
dcoppa 2011-09-23 08:51:26 +00:00
parent 530c7ea2c9
commit d8b7c21435
3 changed files with 8 additions and 33 deletions

View File

@ -1,17 +1,15 @@
# $OpenBSD: Makefile,v 1.2 2011/09/16 08:26:11 espie Exp $
# $OpenBSD: Makefile,v 1.3 2011/09/23 08:51:26 dcoppa Exp $
COMMENT = html5-powered web music server
MODPY_EGG_VERSION = 0.5
MODPY_EGG_VERSION = 0.6
DISTNAME = zeya_${MODPY_EGG_VERSION}.orig
PKGNAME = zeya-${MODPY_EGG_VERSION}
REVISION = 1
CATEGORIES = audio www
HOMEPAGE = http://web.psung.name/zeya/
MASTER_SITES = http://archive.ubuntu.com/ubuntu/pool/universe/z/zeya/ \
http://ftp.de.debian.org/debian/pool/main/z/zeya/
MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/z/zeya/
MAINTAINER = David Coppa <dcoppa@openbsd.org>

View File

@ -1,5 +1,5 @@
MD5 (zeya_0.5.orig.tar.gz) = lXRRzOT2Ofv93y96oSlRKg==
RMD160 (zeya_0.5.orig.tar.gz) = qUUGdMpzG5HutNqn38PPUOgyHEM=
SHA1 (zeya_0.5.orig.tar.gz) = 71U04/Ep7/YCw3z5PYAMfmRjy/Q=
SHA256 (zeya_0.5.orig.tar.gz) = lHdKHECDcK8v8yvIYzyGLpYLlVKvIVutmchEFRtwe5M=
SIZE (zeya_0.5.orig.tar.gz) = 54245
MD5 (zeya_0.6.orig.tar.gz) = 7sgGOeodq7yJlsqeT8bC9A==
RMD160 (zeya_0.6.orig.tar.gz) = pm/M1OIs/WQNvLr99ZyKP9My9YU=
SHA1 (zeya_0.6.orig.tar.gz) = JQeyVzjaigKllFEQ7Lrb6xN3L+U=
SHA256 (zeya_0.6.orig.tar.gz) = GS4ZF1sRaOQY4QRO+0jlSgHC70KP/x3s17pQt/NMp4Q=
SIZE (zeya_0.6.orig.tar.gz) = 54443

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-directory_py,v 1.1.1.1 2011/07/20 07:54:58 dcoppa Exp $
Fall back gracefully when 'followlinks' arg is not supported
(upstream git commit e9e8033274102d34541f54d530b8e4dd5096b23e)
--- directory.py.orig Tue Sep 21 08:13:42 2010
+++ directory.py Mon Jul 11 10:58:20 2011
@@ -169,7 +169,14 @@ class DirectoryBackend(LibraryBackend):
raise IOError("Error: directory %r doesn't exist." % (self._media_path,))
print "Scanning for music in %r..." % (os.path.abspath(self._media_path),)
# Iterate over all the files.
- for path, dirs, files in os.walk(self._media_path, followlinks=True):
+ try:
+ all_files_recursively = os.walk(self._media_path, followlinks=True)
+ except TypeError:
+ # os.walk in Python 2.5 and earlier don't support the followlinks
+ # argument. Fall back to not including it (in this case, Zeya will
+ # not index music underneath symlinked directories).
+ all_files_recursively = os.walk(self._media_path)
+ for path, dirs, files in all_files_recursively:
# Sort dirs so that subdirectories will subsequently be visited
# alphabetically (see os.walk).
dirs.sort(key=tokenize_filename)