[Python-apps-commits] r1845 - in packages/screenlets/trunk/debian/patches (2 files)

[piotr at users.alioth.debian.org]

    Date: Sunday, September 21, 2008 @ 22:04:29
  Author: piotr
Revision: 1845

* use expanduser in patch 04
* don't forget about [] in patch 05

Modified:
  packages/screenlets/trunk/debian/patches/04-install-wallclock-in-home.patch
  packages/screenlets/trunk/debian/patches/05-places-no-bookmark.patch

Modified: packages/screenlets/trunk/debian/patches/04-install-wallclock-in-home.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/04-install-wallclock-in-home.patch	2008-09-21 21:49:20 UTC (rev 1844)
+++ packages/screenlets/trunk/debian/patches/04-install-wallclock-in-home.patch	2008-09-21 22:04:29 UTC (rev 1845)
@@ -7,8 +7,8 @@
  		if extension == 'Wcz' or  extension == 'wcz'	or extension == 'WCZ':
 -			if not os.path.isdir(self.mypath + '/wallpapers/' + basename):
 -				os.mkdir(self.mypath + '/wallpapers/' + basename)
-+			if not os.path.exists(os.environ['HOME'] + '/.screenlets/WallpaperClock/wallpapers'):
-+				os.mkdir(os.environ['HOME'] + '/.screenlets/WallpaperClock/wallpapers')
++			if not os.path.exists(os.path.expanduser('~/.screenlets/WallpaperClock/wallpapers')):
++				os.mkdir(os.path.expanduser('~/.screenlets/WallpaperClock/wallpapers'))
  			os.system('unzip %s %s -d %s' % (tar_opts,chr(34) +  filename + chr(34),os.environ['HOME'] + '/.screenlets/WallpaperClock' + '/wallpapers/' + basename))
  			screenlets.show_message(self,"Wallpaper clock  has been succesfully installed. if not please install unzip" )
  			result = True

Modified: packages/screenlets/trunk/debian/patches/05-places-no-bookmark.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/05-places-no-bookmark.patch	2008-09-21 21:49:20 UTC (rev 1844)
+++ packages/screenlets/trunk/debian/patches/05-places-no-bookmark.patch	2008-09-21 22:04:29 UTC (rev 1845)
@@ -9,7 +9,7 @@
 +		self.places =  [(os.environ['HOME'], 'Home'),
 +						(utils.get_desktop_dir(),'Desktop')]
 +		bookmarks = utils.LoadBookmarks()
-+		if bookmarks is not None:
++		if bookmarks:
 +			self.places.extend(bookmarks)
  		#self.mounts = utils.readMountFile('/proc/mounts')