Untested fixes for PR 1.3

[ussd-widget] / ussd4all / rtcom / rtcompatcher.py

diff --git a/ussd4all/rtcom/rtcompatcher.py b/ussd4all/rtcom/rtcompatcher.py
index 9da9731..7d7cceb 100644 (file)
--- a/ussd4all/rtcom/rtcompatcher.py
+++ b/ussd4all/rtcom/rtcompatcher.py
@@ -77,7 +77,7 @@ if __name__ == '__main__':
 
     library = '/usr/lib/librtcom-call-ui.so.0.0.0'
 
-    if os.access(library+'.orig', os.F_OK):
+    if os.access(library+'-p1', os.F_OK):
         print "It looks like %s has already been patched. Aborting." % (library,)
         sys.exit(1)
 
@@ -85,12 +85,12 @@ if __name__ == '__main__':
 
     if not patcher.check_md5sum(library):
         if not patcher.check_data(library):
-            message = "Your %s is not recognized. So I won't patch it." % (library,)
+            message = "Your %s is not recognized. So I won't patch it." % (library)
            subprocess.call(["dbus-send --type=method_call --dest=org.freedesktop.Notifications /org/freedesktop/Notifications org.freedesktop.Notifications.SystemNoteDialog string:\""+message+"\" uint32:0 string:\"OK\""],shell=True)
            print message       
            sys.exit(1)
         if len(sys.argv) > 1 and sys.argv[1] == '--force':
-            message = "Patching an unrecognized %s. Please test your system before rebooting." % (library,)
+            message = "Patching an unrecognized %s. Please test your system before rebooting." % (library)
            print message           
         else:
            message = "Your %s is not recognized, but it seems to match the patterns.\nRun '%s --force' to try patching anyway, but understand that\nTHIS MAY BREAK YOUR SYSTEM.  If you do, test your system thoroughly before rebooting." % (library,library,sys.argv[0])
@@ -98,5 +98,5 @@ if __name__ == '__main__':
            print message
            sys.exit(1)
 
-    shutil.copy2(library, library+'.orig')
-    patcher.patch_file(library)
+    shutil.copy2(library, library+'-p1')
+    patcher.patch_file(library+'-p1')