Merge release-0.28.17 from 'tools/mic'

[platform/upstream/mic.git] / mic / kickstart / custom_commands / desktop.py

diff --git a/mic/kickstart/custom_commands/desktop.py b/mic/kickstart/custom_commands/desktop.py
index c8bd647..a2359b3 100644 (file)
--- a/mic/kickstart/custom_commands/desktop.py
+++ b/mic/kickstart/custom_commands/desktop.py
@@ -57,7 +57,8 @@ class Mic_Desktop(KickstartCommand):
 
     def _getParser(self):
         try:
-            op = KSOptionParser(lineno=self.lineno)
+            #ingnore this pylit error, the lineno argument exist in olg version. using this way can compate old version.
+            op = KSOptionParser(lineno=self.lineno)  #pylint: disable=unexpected-keyword-arg
         except TypeError:
             # the latest version has not lineno argument
             op = KSOptionParser()
@@ -88,8 +89,8 @@ class Mic_Desktop(KickstartCommand):
             (opts, extra) = self.op.parse_args(args=args)
 
         if extra:
-            m = _("Unexpected arguments to %(command)s command: %(options)s") \
+            m = ("Unexpected arguments to %(command)s command: %(options)s") \
                   % {"command": "desktop", "options": extra}
-            raise KickstartValueError, formatErrorMsg(self.lineno, msg=m)
+            raise KickstartValueError  (formatErrorMsg(self.lineno, msg=m))
 
         self._setToSelf(self.op, opts)