eric: comparison scripts/install.py

-:0835ed67714b
+:2f0d208b8137
 pass
 if sys.platform == "darwin":
 # delete the Mac app bundle
 cleanUpMacAppBundle()
-except (IOError, OSError) as msg:
+except OSError as msg:
 sys.stderr.write(
 'Error: {0}\nTry install with admin rights.\n'.format(msg))
 exit(7)
 for linkName in windowsDesktopNames():
 linkPath = os.path.join(desktopFolder, linkName)
 if os.path.exists(linkPath):
 try:
 os.remove(linkPath)
-except EnvironmentError:
+except OSError:
 # maybe restrictions prohibited link removal
 print("Could not remove '{0}'.".format(linkPath))
 # 2. cleanup start menu entry
 regName = "Programs"
 programsFolder = os.path.normpath(os.path.expandvars(programsEntry))
 eric6EntryPath = os.path.join(programsFolder, windowsProgramsEntry())
 if os.path.exists(eric6EntryPath):
 try:
 shutil.rmtree(eric6EntryPath)
-except EnvironmentError:
+except OSError:
 # maybe restrictions prohibited link removal
 print("Could not remove '{0}'.".format(eric6EntryPath))
 def shutilCopy(src, dst, perm=0o644):
 cfg['ericDir'])
 # create the global plugins directory
 createGlobalPluginsDir()
-except (IOError, OSError) as msg:
+except OSError as msg:
 sys.stderr.write(
 'Error: {0}\nTry install with admin rights.\n'.format(msg))
 return(7)
 # copy some text files to the doc area
 for name in ["LICENSE.GPL3", "THANKS", "changelog"]:
 try:
 shutilCopy(os.path.join(sourceDir, "docs", name),
 cfg['ericDocDir'])
-except EnvironmentError:
+except OSError:
 print("Could not install '{0}'.".format(
 os.path.join(sourceDir, "docs", name)))
 for name in glob.glob(os.path.join(sourceDir, 'docs', 'README*.*')):
 try:
 shutilCopy(name, cfg['ericDocDir'])
-except EnvironmentError:
+except OSError:
 print("Could not install '{0}'.".format(name))
 # copy some more stuff
 for name in ['default.e4k', 'default_Mac.e4k']:
 try:
 shutilCopy(os.path.join(sourceDir, "others", name),
 cfg['ericOthersDir'])
-except EnvironmentError:
+except OSError:
 print("Could not install '{0}'.".format(
 os.path.join(sourceDir, "others", name)))
 # install the API file
 if installApis:
 os.makedirs(apidir)
 for apiName in glob.glob(os.path.join(eric6SourceDir, "APIs",
 progLanguage, "*.api")):
 try:
 shutilCopy(apiName, apidir)
-except EnvironmentError:
+except OSError:
 print("Could not install '{0}' (no permission)."
 .format(apiName))
 for apiName in glob.glob(os.path.join(eric6SourceDir, "APIs",
 progLanguage, "*.bas")):
 try:
 shutilCopy(apiName, apidir)
-except EnvironmentError:
+except OSError:
 print("Could not install '{0}' (no permission)."
 .format(apiName))
 if progLanguage == "Python":
 # copy Python3 API files to the same destination
 for apiName in glob.glob(os.path.join(eric6SourceDir, "APIs",
 "Python3", "*.api")):
 try:
 shutilCopy(apiName, apidir)
-except EnvironmentError:
+except OSError:
 print("Could not install '{0}' (no permission)."
 .format(apiName))
 for apiName in glob.glob(os.path.join(eric6SourceDir, "APIs",
 "Python3", "*.bas")):
 if os.path.exists(os.path.join(
 apidir, os.path.basename(
 apiName.replace(".bas", ".api")))):
 try:
 shutilCopy(apiName, apidir)
-except EnvironmentError:
+except OSError:
 print("Could not install '{0}' (no permission)."
 .format(apiName))
 # copy MicroPython API files to the same destination
 for apiName in glob.glob(os.path.join(eric6SourceDir, "APIs",
 "MicroPython", "*.api")):
 try:
 shutilCopy(apiName, apidir)
-except EnvironmentError:
+except OSError:
 print("Could not install '{0}' (no permission)."
 .format(apiName))
 for apiName in glob.glob(os.path.join(eric6SourceDir, "APIs",
 "MicroPython", "*.bas")):
 if os.path.exists(os.path.join(
 apidir, os.path.basename(
 apiName.replace(".bas", ".api")))):
 try:
 shutilCopy(apiName, apidir)
-except EnvironmentError:
+except OSError:
 print("Could not install '{0}' (no permission)."
 .format(apiName))
 # Create menu entry for Linux systems
 if sys.platform.startswith("linux"):
 programsFolder = os.path.normpath(os.path.expandvars(programsEntry))
 eric6EntryPath = os.path.join(programsFolder, windowsProgramsEntry())
 if not os.path.exists(eric6EntryPath):
 try:
 os.makedirs(eric6EntryPath)
-except EnvironmentError:
+except OSError:
 # maybe restrictions prohibited link creation
 return
 for linkName, targetPath, iconPath in windowsDesktopEntries():
 linkPath = os.path.join(eric6EntryPath, linkName)
 if not fileName:
 return
 try:
 os.rename(fileName, fileName + ".orig")
-except EnvironmentError:
+except OSError:
 pass
 try:
 hgOut = subprocess.check_output(["hg", "identify", "-i"])   # secok
 hgOut = hgOut.decode()
 except (OSError, subprocess.CalledProcessError):
 os.rename(configName, configName + ".orig")
 configNameC = configName + 'c'
 if os.path.exists(configNameC):
 os.remove(configNameC)
 os.remove(configName)
-except EnvironmentError:
+except OSError:
 pass
 # cleanup old installation
 print("Cleaning up old installation ...")
 try:
 if doCleanup:
 if distDir:
 shutil.rmtree(distDir, True)
 else:
 cleanUp()
-except (IOError, OSError) as msg:
+except OSError as msg:
 sys.stderr.write('Error: {0}\nTry install as root.\n'.format(msg))
 exit(7)
 # Create a config file and delete the default one
 print("\nCreating configuration file ...")
 os.remove(configName)
 configNameC = configName + 'c'
 if os.path.exists(configNameC):
 os.remove(configNameC)
 os.rename(configName + ".orig", configName)
-except EnvironmentError:
+except OSError:
 pass
 try:
 if installFromSource and infoName:
 os.remove(infoName)
 infoNameC = infoName + 'c'
 if os.path.exists(infoNameC):
 os.remove(infoNameC)
 os.rename(infoName + ".orig", infoName)
-except EnvironmentError:
+except OSError:
 pass
 print("\nInstallation complete.")
 print()

Mercurial Repositories > eric / file comparison

comparison: scripts/install.py

scripts/install.py