r5273 - in packages/trunk/tpclient-pywx/debian: . patches

[Barry deFreese]

Author: bddebian-guest
Date: 2008-01-08 21:38:20 +0000 (Tue, 08 Jan 2008)
New Revision: 5273

Added:
   packages/trunk/tpclient-pywx/debian/patches/01_requirements_chmod.diff
Removed:
   packages/trunk/tpclient-pywx/debian/patches/01_sys_path.diff
Modified:
   packages/trunk/tpclient-pywx/debian/changelog
   packages/trunk/tpclient-pywx/debian/patches/series
Log:
Remove previous path patch
  * 01_requirements_chmod.diff - Fix check on permissions


Modified: packages/trunk/tpclient-pywx/debian/changelog
===================================================================
--- packages/trunk/tpclient-pywx/debian/changelog	2008-01-08 21:14:13 UTC (rev 5272)
+++ packages/trunk/tpclient-pywx/debian/changelog	2008-01-08 21:38:20 UTC (rev 5273)
@@ -5,8 +5,7 @@
   * Add quilt patch system
   * Work in progress..
   * Getting close but now a permissions issue
-  * 01_sys_path.diff - Append installed path
-    + May not be necessary now that /usr/games/tpclient.. is a symlink?
+  * 01_requirements_chmod.diff - Fix check on permissions
 
  -- Barry deFreese <bddebian at comcast.net>  Mon, 05 Nov 2007 21:33:27 -0500
 

Added: packages/trunk/tpclient-pywx/debian/patches/01_requirements_chmod.diff
===================================================================
--- packages/trunk/tpclient-pywx/debian/patches/01_requirements_chmod.diff	                        (rev 0)
+++ packages/trunk/tpclient-pywx/debian/patches/01_requirements_chmod.diff	2008-01-08 21:38:20 UTC (rev 5273)
@@ -0,0 +1,15 @@
+diff -urN tpclient-pywx.orig/requirements.py tpclient-pywx/requirements.py
+--- tpclient-pywx.orig/requirements.py	2007-03-05 06:04:58.000000000 -0500
++++ tpclient-pywx/requirements.py	2008-01-08 10:56:42.000000000 -0500
+@@ -144,7 +144,10 @@
+ 		else:
+ 			print location
+ 			# Check the file is executable
+-			os.chmod(location, stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR|stat.S_IRGRP|stat.S_IXGRP|stat.S_IROTH|stat.S_IXOTH)
++			try:
++				os.chmod(location, stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR|stat.S_IRGRP|stat.S_IXGRP|stat.S_IROTH|stat.S_IXOTH)
++			except OSError, e:
++				print "Could not make the client's file executable", e
+ 
+ 			# Register the URL Handlers
+ 			try:

Deleted: packages/trunk/tpclient-pywx/debian/patches/01_sys_path.diff
===================================================================
--- packages/trunk/tpclient-pywx/debian/patches/01_sys_path.diff	2008-01-08 21:14:13 UTC (rev 5272)
+++ packages/trunk/tpclient-pywx/debian/patches/01_sys_path.diff	2008-01-08 21:38:20 UTC (rev 5273)
@@ -1,13 +0,0 @@
-diff -urN tpclient-pywx.orig/tpclient-pywx tpclient-pywx/tpclient-pywx
---- tpclient-pywx.orig/tpclient-pywx	2007-11-07 16:24:17.000000000 -0500
-+++ tpclient-pywx/tpclient-pywx	2007-11-07 16:30:04.000000000 -0500
-@@ -3,6 +3,9 @@
- import os
- import os.path
- import sys
-+
-+sys.path.append("/usr/share/games/tpclient-pywx")
-+
- if hasattr(sys, 'frozen'):
- 	import warnings
- 	warnings.simplefilter('ignore', DeprecationWarning)

Modified: packages/trunk/tpclient-pywx/debian/patches/series
===================================================================
--- packages/trunk/tpclient-pywx/debian/patches/series	2008-01-08 21:14:13 UTC (rev 5272)
+++ packages/trunk/tpclient-pywx/debian/patches/series	2008-01-08 21:38:20 UTC (rev 5273)
@@ -1,2 +1 @@
-01_sys_path.diff
-
+01_requirements_chmod.diff