[Python-apps-commits] r7970 - in packages/beets/trunk/debian (3 files)

[stefanor at users.alioth.debian.org]

    Date: Saturday, December 17, 2011 @ 16:28:45
  Author: stefanor
Revision: 7970

Patch: libmpd-incompatibility: Allow browsing via libmpc based clients.

Added:
  packages/beets/trunk/debian/patches/libmpd-incompatibility
Modified:
  packages/beets/trunk/debian/changelog
  packages/beets/trunk/debian/patches/series

Modified: packages/beets/trunk/debian/changelog
===================================================================
--- packages/beets/trunk/debian/changelog	2011-12-17 05:07:04 UTC (rev 7969)
+++ packages/beets/trunk/debian/changelog	2011-12-17 16:28:45 UTC (rev 7970)
@@ -1,3 +1,9 @@
+beets (1.0~b11-2) UNRELEASED; urgency=low
+
+  * Patch: libmpd-incompatibility: Allow browsing via libmpc based clients.
+
+ -- Stefano Rivera <stefanor at debian.org>  Sat, 17 Dec 2011 18:28:04 +0200
+
 beets (1.0~b11-1) unstable; urgency=low
 
   * New upstream release (Closes: #650078)

Added: packages/beets/trunk/debian/patches/libmpd-incompatibility
===================================================================
--- packages/beets/trunk/debian/patches/libmpd-incompatibility	                        (rev 0)
+++ packages/beets/trunk/debian/patches/libmpd-incompatibility	2011-12-17 16:28:45 UTC (rev 7970)
@@ -0,0 +1,21 @@
+Description: fix BPD lsinfo results for libmpc
+Author: Adrian Sampson <adrian at radbox.org>
+Origin: upstream, http://code.google.com/p/beets/source/detail?r=a7445071ce5dd7f6ad77c7a90848f3ede489a694
+Bug-Upstream: http://code.google.com/p/beets/issues/detail?id=277
+Last-Update: 2011-12-17
+
+--- a/beetsplug/bpd/__init__.py
++++ b/beetsplug/bpd/__init__.py
+@@ -797,7 +797,11 @@
+                 item = self.lib.get_item(itemid)
+                 yield self._item_info(item)
+             for name, _ in node.dirs.iteritems():
+-                yield u'directory: ' + self._path_join(path, name)
++                dirpath = self._path_join(path, name)
++                if dirpath.startswith(u"/"):
++                    # Strip leading slash (libmpc rejects this).
++                    dirpath = dirpath[1:]
++                yield u'directory: %s' % dirpath
+         
+     def _listall(self, basepath, node, info=False):
+         """Helper function for recursive listing. If info, show

Modified: packages/beets/trunk/debian/patches/series
===================================================================
--- packages/beets/trunk/debian/patches/series	2011-12-17 05:07:04 UTC (rev 7969)
+++ packages/beets/trunk/debian/patches/series	2011-12-17 16:28:45 UTC (rev 7970)
@@ -1,2 +1,3 @@
+libmpd-incompatibility
 unittest2
 private-module