[quodlibet: 1/2] fixed the patch
hannes
hannes at fedoraproject.org
Sat Feb 23 08:29:41 UTC 2013
commit 4b85ce6ba954b338f46fab57f763db03dd9640d0
Author: hannes <hannes at fedoraproject.org>
Date: Sat Feb 23 09:28:58 2013 +0100
fixed the patch
quodlibet-2.5-masked-library.patch | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/quodlibet-2.5-masked-library.patch b/quodlibet-2.5-masked-library.patch
index a3384cb..138ffa9 100644
--- a/quodlibet-2.5-masked-library.patch
+++ b/quodlibet-2.5-masked-library.patch
@@ -1,5 +1,5 @@
--- quodlibet-2.5/quodlibet/util/collection.py 2012-12-19 09:47:41.000000000 +0100
-+++ quodlibet-2.5/quodlibet/util/edited_collection.py 2013-02-23 08:56:35.287597920 +0100
++++ quodlibet-2.5/quodlibet/util/edited_collection.py 2013-02-23 09:27:45.708214444 +0100
@@ -451,8 +451,6 @@
line = util.fsnative(line.rstrip())
if line in library:
@@ -9,7 +9,7 @@
except IOError:
if self.name: self.write()
-@@ -484,25 +482,15 @@
+@@ -484,24 +482,14 @@
"""
changed = False
for song in songs:
@@ -31,19 +31,17 @@
- changed = True
- break
- else:
-- changed = True
-+ while song in self.songs:
-+ print_d("Removing \"%s\" from playlist \"%s\"..."
-+ % (song["~filename"], self.name))
-+ self.songs.remove(song)
-+ if leave_dupes:
-+ changed = True
-+ break
-+ else:
-+ changed = True
++ while song in self.songs:
++ print_d("Removing \"%s\" from playlist \"%s\"..."
++ % (song["~filename"], self.name))
++ self.songs.remove(song)
++ if leave_dupes:
++ changed = True
++ break
++ else:
+ changed = True
# Evict song from cache entirely
try:
- del self._song_map_cache[song]
@@ -511,7 +499,6 @@
return changed
@@ -52,13 +50,15 @@
some, all = False, True
for song in songs:
found = song in self.songs
-@@ -530,8 +517,7 @@
+@@ -530,9 +517,8 @@
basename = self.quote(self.name)
f = file(os.path.join(self.dir, basename), "w")
for song in self:
- try: f.write(util.fsencode(song("~filename")) + "\n")
- except TypeError: f.write(song + "\n")
-+ f.write(util.fsencode(song("~filename")) + "\n")
- f.close()
+- f.close()
++ f.write(util.fsencode(song("~filename")) + "\n")
++ f.close()
def format(self):
+ """A markup representation of information for this playlist"""
More information about the scm-commits
mailing list