\r
## import modules\r
#\r
-from Core import FileHook\r
+import locale\r
import sys\r
+encoding = locale.getdefaultlocale()[1]\r
+if encoding:\r
+ reload(sys)\r
+ sys.setdefaultencoding(encoding)\r
+from Core import FileHook\r
import os.path\r
from sys import platform\r
import platform as pf\r
Logger.SetLevel(Logger.VERBOSE)\r
elif Opt.opt_quiet:\r
Logger.SetLevel(Logger.QUIET + 1)\r
- elif Opt.debug_level != None:\r
+ elif Opt.debug_level is not None:\r
if Opt.debug_level < 0 or Opt.debug_level > 9:\r
Logger.Warn("UPT", ST.ERR_DEBUG_LEVEL)\r
Logger.SetLevel(Logger.INFO)\r
\r
Parser.add_option("-q", "--quiet", action="store_true", dest="opt_quiet", help=ST.HLP_RETURN_AND_DISPLAY)\r
\r
- Parser.add_option("-i", "--install", action="store", type="string", dest="Install_Distribution_Package_File",\r
+ Parser.add_option("-i", "--install", action="append", type="string", dest="Install_Distribution_Package_File",\r
help=ST.HLP_SPECIFY_PACKAGE_NAME_INSTALL)\r
\r
Parser.add_option("-c", "--create", action="store", type="string", dest="Create_Distribution_Package_File",\r
\r
try:\r
GlobalData.gWORKSPACE, GlobalData.gPACKAGE_PATH = GetWorkspace()\r
- except FatalError, XExcept:\r
+ except FatalError as XExcept:\r
if Logger.GetLevel() <= Logger.DEBUG_9:\r
Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + format_exc())\r
return XExcept.args[0]\r
RunModule = MkPkg.Main\r
\r
elif Opt.PackFileToInstall:\r
- if not Opt.PackFileToInstall.endswith('.dist'):\r
- Logger.Error("InstallPkg", FILE_TYPE_MISMATCH, ExtraData=ST.ERR_DIST_EXT_ERROR % Opt.PackFileToInstall)\r
+ AbsPath = []\r
+ for Item in Opt.PackFileToInstall:\r
+ if not Item.endswith('.dist'):\r
+ Logger.Error("InstallPkg", FILE_TYPE_MISMATCH, ExtraData=ST.ERR_DIST_EXT_ERROR % Item)\r
\r
- AbsPath = GetFullPathDist(Opt.PackFileToInstall, WorkspaceDir)\r
- if not AbsPath:\r
- Logger.Error("InstallPkg", FILE_NOT_FOUND, ST.ERR_INSTALL_DIST_NOT_FOUND % Opt.PackFileToInstall)\r
+ AbsPath.append(GetFullPathDist(Item, WorkspaceDir))\r
+ if not AbsPath:\r
+ Logger.Error("InstallPkg", FILE_NOT_FOUND, ST.ERR_INSTALL_DIST_NOT_FOUND % Item)\r
\r
Opt.PackFileToInstall = AbsPath\r
setattr(Opt, 'PackageFile', Opt.PackFileToInstall)\r
return OPTION_MISSING\r
\r
ReturnCode = RunModule(Opt)\r
- except FatalError, XExcept:\r
+ except FatalError as XExcept:\r
ReturnCode = XExcept.args[0]\r
if Logger.GetLevel() <= Logger.DEBUG_9:\r
Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + \\r
else:\r
GlobalData.gDB.Commit()\r
Mgr.commit()\r
- except StandardError:\r
+ except Exception:\r
Logger.Quiet(ST.MSG_RECOVER_FAIL)\r
GlobalData.gDB.CloseDb()\r
\r