rpms/gpodder/F-12 gpodder.git-b4886df.patch, NONE, 1.1 gpodder.spec, 1.41, 1.42

[Ville-Pekka Vainio]

Author: vpv

Update of /cvs/pkgs/rpms/gpodder/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1825

Modified Files:
	gpodder.spec 
Added Files:
	gpodder.git-b4886df.patch 
Log Message:
* Fri May 28 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.3-3
- Forgot to cvs add the other patch, rebuild


gpodder.git-b4886df.patch:
 gui.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE gpodder.git-b4886df.patch ---
>From b4886df89a53699ae37dff6447ee4e61457e9144 Mon Sep 17 00:00:00 2001
From: Thomas Perl <thp at thpinfo.com>
Date: Fri, 28 May 2010 19:43:32 +0200
Subject: [PATCH] Ignore invalid episode items (bug 934)

In case the episode list is in an inconsistent
state, we simply ignore that episode an continue
with the rest.
---
 src/gpodder/gui.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/gpodder/gui.py b/src/gpodder/gui.py
index d0673eb..b0012b6 100644
--- a/src/gpodder/gui.py
+++ b/src/gpodder/gui.py
@@ -2124,7 +2124,11 @@ class gPodder(BuilderWidget, dbus.service.Object):
             (model, paths) = selection.get_selected_rows()
          
             for path in paths:
-                episode = model.get_value(model.get_iter(path), EpisodeListModel.C_EPISODE)
+                try:
+                    episode = model.get_value(model.get_iter(path), EpisodeListModel.C_EPISODE)
+                except TypeError, te:
+                    log('Invalid episode at path %s', str(path), sender=self)
+                    continue
 
                 if episode.file_type() not in ('audio', 'video'):
                     open_instead_of_play = True
-- 
1.6.5.GIT



Index: gpodder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/F-12/gpodder.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- gpodder.spec	28 May 2010 19:38:19 -0000	1.41
+++ gpodder.spec	28 May 2010 19:43:33 -0000	1.42
@@ -3,7 +3,7 @@
 
 Name:           gpodder
 Version:        2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Podcast receiver/catcher written in Python
 
 Group:          Applications/Multimedia
@@ -88,6 +88,9 @@ fi
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Fri May 28 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.3-3
+- Forgot to cvs add the other patch, rebuild
+
 * Fri May 28 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.3-2
 - Add a patch from upstream for TypeError in gui.py, upstream bug #934,
   rhbz #594907