Attachment #37303 for bug #59440

View | Details | Raw Unified | Return to bug 59440
Collapse All | Expand All

Lines 7-14 Link Here

(-)gdesklets-goodweather/Makefile (-1 / +8 lines)
7		7
8	PORTNAME= goodweather	8	PORTNAME= goodweather
9	PORTVERSION= 0.1	9	PORTVERSION= 0.1
		10	PORTREVISION= 1
10	CATEGORIES= astro gnome	11	CATEGORIES= astro gnome
11	MASTER_SITES= http://people.roqe.org/kr/misc/	12	MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ \
		13	http://people.roqe.org/kr/misc/
12	PKGNAMEPREFIX= gdesklets-	14	PKGNAMEPREFIX= gdesklets-
13	DISTNAME= GoodWeather-${PORTVERSION}	15	DISTNAME= GoodWeather-${PORTVERSION}
14		16
Lines 18-23 Link Here
18	RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets	20	RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets
19		21
20	USE_BZIP2= yes	22	USE_BZIP2= yes
		23	USE_PYTHON= yes
21	USE_X_PREFIX= yes	24	USE_X_PREFIX= yes
22	USE_REINPLACE= yes	25	USE_REINPLACE= yes
23		26
Lines 27-32 Link Here
27		30
28	do-build:	31	do-build:
29	@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}	32	@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
		33	@${PATCH} ${WRKSRC}/${NAME}/__init__.py < ${FILESDIR}/${NAME}::__init__.py
		34	@${FIND} ${WRKSRC} -name '*.orig' -delete
30		35
31	do-install:	36	do-install:
32	@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx	37	@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx
Lines 46-51 Link Here
46	${DATADIR}/gdesklets/Sensors/${NAME}/README	51	${DATADIR}/gdesklets/Sensors/${NAME}/README
47		52
48	post-install:	53	post-install:
		54	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
		55	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
49	@${CAT} ${PKGMESSAGE}	56	@${CAT} ${PKGMESSAGE}
50		57
51	.include <bsd.port.mk>	58	.include <bsd.port.mk>




# Many thanks to Franz Klammer <klammer@webonaut.com> for help
# and create this patch.

--- GoodWeather/__init__.py.orig	Tue Nov 18 16:38:53 2003
+++ GoodWeather/__init__.py	Tue Nov 18 16:40:14 2003
@@ -151,7 +151,14 @@
                 fh = urllib.urlopen(self.WEATHER_SOURCE % vars())
                 data = fh.read()
    
-                weather = parseGoodWeatherData(data) 
+                #weather = parseGoodWeatherData(data)
+                data_error = re.search(r'''(<error>)''', data)
+                if not data_error:
+                   weather = parseGoodWeatherData(data) 
+                else:
+                   time.sleep(1)
+                   continue
+
                 metric = 0
                 if (units == self.CELSIUS): 
                    metric = 1 

Return to bug 59440

Line 0 Link Here

(-)gdesklets-goodweather/files/GoodWeather::__init__.py (+21 lines)
	1	# Many thanks to Franz Klammer <klammer@webonaut.com> for help
	2	# and create this patch.
	3
	4	--- GoodWeather/__init__.py.orig Tue Nov 18 16:38:53 2003
	5	+++ GoodWeather/__init__.py Tue Nov 18 16:40:14 2003
	6	@@ -151,7 +151,14 @@
	7	fh = urllib.urlopen(self.WEATHER_SOURCE % vars())
	8	data = fh.read()
	9
	10	- weather = parseGoodWeatherData(data)
	11	+ #weather = parseGoodWeatherData(data)
	12	+ data_error = re.search(r'''(<error>)''', data)
	13	+ if not data_error:
	14	+ weather = parseGoodWeatherData(data)
	15	+ else:
	16	+ time.sleep(1)
	17	+ continue
	18	+
	19	metric = 0
	20	if (units == self.CELSIUS):
	21	metric = 1

Lines 6-11 Link Here

(-)gdesklets-goodweather/pkg-plist (+4 lines)
6	share/gnome/gdesklets/Displays/GoodWeather/gfx/bg-weather.png	6	share/gnome/gdesklets/Displays/GoodWeather/gfx/bg-weather.png
7	share/gnome/gdesklets/Sensors/GoodWeather/README	7	share/gnome/gdesklets/Sensors/GoodWeather/README
8	share/gnome/gdesklets/Sensors/GoodWeather/__init__.py	8	share/gnome/gdesklets/Sensors/GoodWeather/__init__.py
		9	share/gnome/gdesklets/Sensors/GoodWeather/__init__.pyc
		10	share/gnome/gdesklets/Sensors/GoodWeather/__init__.pyo
9	share/gnome/gdesklets/Sensors/GoodWeather/liquid/large_icons/1.png	11	share/gnome/gdesklets/Sensors/GoodWeather/liquid/large_icons/1.png
10	share/gnome/gdesklets/Sensors/GoodWeather/liquid/large_icons/10.png	12	share/gnome/gdesklets/Sensors/GoodWeather/liquid/large_icons/10.png
11	share/gnome/gdesklets/Sensors/GoodWeather/liquid/large_icons/11.png	13	share/gnome/gdesklets/Sensors/GoodWeather/liquid/large_icons/11.png
Lines 285-290 Link Here
285	share/gnome/gdesklets/Sensors/GoodWeather/weather.com/small_icons/9.png	287	share/gnome/gdesklets/Sensors/GoodWeather/weather.com/small_icons/9.png
286	share/gnome/gdesklets/Sensors/GoodWeather/weather.com/small_icons/na.png	288	share/gnome/gdesklets/Sensors/GoodWeather/weather.com/small_icons/na.png
287	share/gnome/gdesklets/Sensors/GoodWeather/weather.py	289	share/gnome/gdesklets/Sensors/GoodWeather/weather.py
		290	share/gnome/gdesklets/Sensors/GoodWeather/weather.pyc
		291	share/gnome/gdesklets/Sensors/GoodWeather/weather.pyo
288	@dirrm share/gnome/gdesklets/Sensors/GoodWeather/weather.com/small_icons	292	@dirrm share/gnome/gdesklets/Sensors/GoodWeather/weather.com/small_icons
289	@dirrm share/gnome/gdesklets/Sensors/GoodWeather/weather.com/large_icons	293	@dirrm share/gnome/gdesklets/Sensors/GoodWeather/weather.com/large_icons
290	@dirrm share/gnome/gdesklets/Sensors/GoodWeather/weather.com	294	@dirrm share/gnome/gdesklets/Sensors/GoodWeather/weather.com