diff options
-rw-r--r-- | desktop/CurseTheWeather/CurseTheWeather-0.6-patch | 19 | ||||
-rw-r--r-- | desktop/CurseTheWeather/CurseTheWeather.SlackBuild | 5 |
2 files changed, 20 insertions, 4 deletions
diff --git a/desktop/CurseTheWeather/CurseTheWeather-0.6-patch b/desktop/CurseTheWeather/CurseTheWeather-0.6-patch index a2166a8ff9..71bd29087b 100644 --- a/desktop/CurseTheWeather/CurseTheWeather-0.6-patch +++ b/desktop/CurseTheWeather/CurseTheWeather-0.6-patch @@ -1,6 +1,6 @@ diff -Naur CurseTheWeather-0.6-orig/ctw CurseTheWeather-0.6/ctw --- CurseTheWeather-0.6-orig/ctw 2009-10-05 10:46:02.000000000 -0400 -+++ CurseTheWeather-0.6/ctw 2013-11-08 18:46:54.747612989 -0500 ++++ CurseTheWeather-0.6/ctw 2014-11-22 16:29:05.803956562 -0500 @@ -183,19 +183,19 @@ forecastWindowsCreated = True day = 0 @@ -27,7 +27,7 @@ diff -Naur CurseTheWeather-0.6-orig/ctw CurseTheWeather-0.6/ctw win.box() diff -Naur CurseTheWeather-0.6-orig/weatherfeed.py CurseTheWeather-0.6/weatherfeed.py --- CurseTheWeather-0.6-orig/weatherfeed.py 2009-07-14 08:17:40.000000000 -0400 -+++ CurseTheWeather-0.6/weatherfeed.py 2013-11-08 18:54:08.193597004 -0500 ++++ CurseTheWeather-0.6/weatherfeed.py 2014-11-22 17:26:07.789830359 -0500 @@ -48,11 +48,11 @@ def _getData(self): @@ -62,7 +62,20 @@ diff -Naur CurseTheWeather-0.6-orig/weatherfeed.py CurseTheWeather-0.6/weatherfe def _setCurrentConditions(self, node): for elem in node.childNodes: -@@ -234,10 +240,6 @@ +@@ -183,7 +189,11 @@ + self.forecast[index]["day"] = {} + for subelem in elem.childNodes: + if subelem.nodeName == 't': +- self.forecast[index]["day"]["type"] = subelem.firstChild.data ++ # type may be blank ++ if subelem.firstChild: ++ self.forecast[index]["day"]["type"] = subelem.firstChild.data ++ else: ++ self.forecast[index]["day"]["type"] = " " + + if subelem.nodeName == 'ppcp': + self.forecast[index]["day"]["pop"] = subelem.firstChild.data +@@ -234,10 +244,6 @@ self.forecast[index]["night"]["wind"]["direction"] = windelem.firstChild.data diff --git a/desktop/CurseTheWeather/CurseTheWeather.SlackBuild b/desktop/CurseTheWeather/CurseTheWeather.SlackBuild index dabaa2f468..e848c7b377 100644 --- a/desktop/CurseTheWeather/CurseTheWeather.SlackBuild +++ b/desktop/CurseTheWeather/CurseTheWeather.SlackBuild @@ -24,9 +24,12 @@ # Modified by the SlackBuilds.org project. +# Build 3 contains updated patch to fix upstream errors due to day type having no data in XML +# Better error checking or exception handling should probably be implemented in the source + PRGNAM=CurseTheWeather VERSION=0.6 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then |