minor bug fix, changed timeout, avoid broken files

diff --git a/build_setup.py b/build_setup.py
index e258988..b13dd20 100644 (file)
--- a/build_setup.py
+++ b/build_setup.py
@@ -37,7 +37,7 @@ if __name__ == "__main__":
         #  p.prer 1000 emove="""#!/bin/sh
         #  chmod +x /usr/bin/mclock.py""" #Set here your pre remove script
         version = "0.3.4"           #Version of your software, e.g. "1.2.0" or "0.8.2"
         #  p.prer 1000 emove="""#!/bin/sh
         #  chmod +x /usr/bin/mclock.py""" #Set here your pre remove script
         version = "0.3.4"           #Version of your software, e.g. "1.2.0" or "0.8.2"

-        build = "1"                 #Build number, e.g. "1" for the first build of this version of your software. Increment for later re-builds of the same version of your software.
+        build = "2"                 #Build number, e.g. "1" for the first build of this version of your software. Increment for later re-builds of the same version of your software.

                                      #Text with changelog information to be displayed in the package "Details" tab of the Maemo Application Manager
         changeloginformation = "possibility to change size of the widget with a config file" 
         dir_name = "src"            #Name of the subfolder containing your package source files (e.g. usr\share\icons\hicolor\scalable\myappicon.svg, usr\lib\myapp\somelib.py). We suggest to leave it named src in all projects and will refer to that in the wiki article on maemo.org
                                      #Text with changelog information to be displayed in the package "Details" tab of the Maemo Application Manager
         changeloginformation = "possibility to change size of the widget with a config file" 
         dir_name = "src"            #Name of the subfolder containing your package source files (e.g. usr\share\icons\hicolor\scalable\myappicon.svg, usr\lib\myapp\somelib.py). We suggest to leave it named src in all projects and will refer to that in the wiki article on maemo.org

diff --git a/debian/changelog b/debian/changelog
index 5d907cd..87dd1a0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-comic-widget (0.3.4-1) stable; urgency=low
+comic-widget (0.3.4-2) stable; urgency=low

 
   possibility to change size of the widget with a config file
 
 
   possibility to change size of the widget with a config file
 

- -- Marcus Wikstrom <mece@ovi.com>  Fri, 05 Feb 2010 14:35:02 +0000
+ -- Marcus Wikstrom <mece@ovi.com>  Fri, 05 Feb 2010 20:14:29 +0000

diff --git a/debian/copyright b/debian/copyright
index 7ed12f4..a68c367 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 This package was py2debianized(0.5.1) by Marcus Wikstrom <mece@ovi.com> on
 This package was py2debianized(0.5.1) by Marcus Wikstrom <mece@ovi.com> on

-Fri, 05 Feb 2010 14:35:02 +0000.
+Fri, 05 Feb 2010 20:14:29 +0000.

 
 It was downloaded from 
 
 
 It was downloaded from 
 

diff --git a/extras-devel/comic-widget_0.3.4-2.changes b/extras-devel/comic-widget_0.3.4-2.changes
new file mode 100644 (file)
index 0000000..e47d53a
--- /dev/null
+++ b/extras-devel/comic-widget_0.3.4-2.changes
@@ -0,0 +1,17 @@
+Maintainer: Marcus Wikstrom <mece@ovi.com>
+Format: 1.7
+Source: comic-widget
+Version: 0.3.4-2
+Architecture: all
+Date: Fri, 05 Feb 2010 18:14:35 +0000
+Distribution: fremantle
+Urgency: low
+Description: 
+ A widget that displays comics taken from the web.
+Changes: 
+ possibility to change size of the widget with a config file
+Changed-By: Marcus Wikstrom <mece@ovi.com>
+Files:
+ a064d4f51f570cafeca7cdb7bfd44944 74629 user/desktop extras-devel comic-widget_0.3.4-2.tar.gz
+ 3ad62938ab4c5f6c368d9aa07bab9537 349 user/desktop extras-devel comic-widget_0.3.4-2.dsc
+

diff --git a/extras-devel/comic-widget_0.3.4-2.dsc b/extras-devel/comic-widget_0.3.4-2.dsc
new file mode 100644 (file)
index 0000000..d831ad4
--- /dev/null
+++ b/extras-devel/comic-widget_0.3.4-2.dsc
@@ -0,0 +1,10 @@
+Source: comic-widget
+Version: 0.3.4-2
+Maintainer: Marcus Wikstrom <mece@ovi.com>
+Architecture: all
+Format: 1.0
+Build-Depends: python2.5, python-osso, python-gtk2, python-hildon, python-hildondesktop, python2.5-cairo, hildon-desktop-python-loader
+Standards-Version: 0.3.4-2
+Files:
+ a064d4f51f570cafeca7cdb7bfd44944 74629 comic-widget_0.3.4-2.tar.gz
+

diff --git a/extras-devel/comic-widget_0.3.4-2.tar.gz b/extras-devel/comic-widget_0.3.4-2.tar.gz
new file mode 100644 (file)
index 0000000..2cc0475
Binary files /dev/null and b/extras-devel/comic-widget_0.3.4-2.tar.gz differ

diff --git a/src/usr/lib/hildon-desktop/comicwidget.py b/src/usr/lib/hildon-desktop/comicwidget.py
index 950bd5f..01fa400 100644 (file)
--- a/src/usr/lib/hildon-desktop/comicwidget.py
+++ b/src/usr/lib/hildon-desktop/comicwidget.py
@@ -12,6 +12,9 @@ import cairo
 import datetime
 import shutil
 import sys
 import datetime
 import shutil
 import sys

+import socket
+
+socket.setdefaulttimeout(10)

 
 supports_alpha = False
 
 
 supports_alpha = False
 

@@ -22,7 +25,7 @@ supports_alpha = False
 
 # constants. dbfile is the location of the csv
 # comiccache is the location of the images
 
 # constants. dbfile is the location of the csv
 # comiccache is the location of the images

-APP_VERSION = "0.3.4-1"
+APP_VERSION = "0.3.4-2"

 
 basedbdir = "/opt/comic-widget/db/"
 imagedir = "/opt/comic-widget/images/"
 
 basedbdir = "/opt/comic-widget/db/"
 imagedir = "/opt/comic-widget/images/"

@@ -137,7 +140,12 @@ class ComicDb():
                                        print "created dir"
                                except:
                                        print "comic db creation failed on mkdir"
                                        print "created dir"
                                except:
                                        print "comic db creation failed on mkdir"

-                       urllib.urlretrieve(dbrow['url'], filename)
+                       try:
+
+                               urllib.urlretrieve(dbrow['url'], filename)
+                       except:
+                               if os.path.isfile(filename):
+                                       os.remove(filename)

                        print "success\n"
                        return filename
 
                        print "success\n"
                        return filename