Преглед изворни кода

FIX: Crash in python scripts on import error

Alexander Koblov пре 10 година
родитељ
комит
df0ed5d339
2 измењених фајлова са 14 додато и 7 уклоњено
  1. 8 4
      scripts/doublecmd-kde.py
  2. 6 3
      scripts/rabbit-vcs.py

+ 8 - 4
scripts/doublecmd-kde.py

@@ -23,10 +23,14 @@
 #
 
 import sys
-from PyKDE4.kdeui import KApplication
-from PyKDE4.kdecore import KService, KLocale, KGlobal
-from PyKDE4.kdecore import ki18n, KAboutData, KCmdLineArgs, KUrl, KCmdLineOptions
-from PyKDE4.kio import  KFileItem, KFileItemList, KPropertiesDialog, KRun, KOpenWithDialog
+
+try:
+  from PyKDE4.kdeui import KApplication
+  from PyKDE4.kdecore import KService, KLocale, KGlobal
+  from PyKDE4.kdecore import ki18n, KAboutData, KCmdLineArgs, KUrl, KCmdLineOptions
+  from PyKDE4.kio import  KFileItem, KFileItemList, KPropertiesDialog, KRun, KOpenWithDialog
+except:
+  exit(1)
 
 # Show help message
 def Help():

+ 6 - 3
scripts/rabbit-vcs.py

@@ -26,9 +26,12 @@
 import os, os.path
 import sys
 
-from rabbitvcs.util.contextmenuitems import *
-from rabbitvcs.util.contextmenu import MenuBuilder, MainContextMenu, MainContextMenuCallbacks
-from rabbitvcs.services.checkerservice import StatusCheckerStub
+try:
+  from rabbitvcs.util.contextmenuitems import *
+  from rabbitvcs.util.contextmenu import MenuBuilder, MainContextMenu, MainContextMenuCallbacks
+  from rabbitvcs.services.checkerservice import StatusCheckerStub
+except:
+  exit(1)
 
 class DCSender:
   """Double Commander sender class"""