summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangbiao <biao716.wang@samsung.com>2023-11-08 18:28:17 +0900
committerwangbiao <biao716.wang@samsung.com>2023-11-08 18:28:17 +0900
commit916ec58ffcc0ad7335d64209187a436bf13ed730 (patch)
tree5a8365e423697ecda5eba1788e3c702b2471b869
parent2154b73ef02602f5beb905a7ff77e53ee1ea359e (diff)
downloadmic-916ec58ffcc0ad7335d64209187a436bf13ed730.tar.gz
mic-916ec58ffcc0ad7335d64209187a436bf13ed730.tar.bz2
mic-916ec58ffcc0ad7335d64209187a436bf13ed730.zip
bump up to release 0.29.1upstream/0.29.1
Change-Id: I9ec8c94ab3f60633ee6c7123d9ccdebc1b46ff72 Signed-off-by: wangbiao <biao716.wang@samsung.com>
-rw-r--r--ChangeLog6
-rw-r--r--doc/RELEASE_NOTES13
-rwxr-xr-xmic/__init__.py2
-rw-r--r--mic/msger.py3
-rw-r--r--packaging/mic.changes4
-rwxr-xr-xpackaging/mic.spec2
-rwxr-xr-xtools/mic16
7 files changed, 43 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5cc41d8..a196dad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Release 0.29.1 - Wed Nov. 01 2023 - Biao Wang <biao716.wang@samsung.com>
+=====================================================================
+ * Support opensuse15.x distro
+ * Support ubuntu 22.04 distro
+ * Port code from python2.x to python3.x
+
Release 0.28.19 - Thu Apr. 13 2023 - Biao Wang <biao716.wang@samsung.com>
=====================================================================
* Fix mic create image error with rpm 4.14 if %prepackages section exists in ks file.
diff --git a/doc/RELEASE_NOTES b/doc/RELEASE_NOTES
index ec8744d..8657123 100644
--- a/doc/RELEASE_NOTES
+++ b/doc/RELEASE_NOTES
@@ -1,3 +1,16 @@
+MIC Image Creator 0.29.1 Release Notes
+======================================
+Released Nov 01 2023
+
+This release note documents the changes included in the new release. And
+the release contains new features.
+
+new features
+--------------------------
+ * Support opensuse15.x distro
+ * Support ubuntu 22.04 distro
+ * Port code from python2.x to python3.x
+
MIC Image Creator 0.28.19 Release Notes
======================================
Released Apr 13 2023
diff --git a/mic/__init__.py b/mic/__init__.py
index a60b9b1..2c4a11d 100755
--- a/mic/__init__.py
+++ b/mic/__init__.py
@@ -16,7 +16,7 @@
import os, sys
-__version__ = "0.28.19"
+__version__ = "0.29.1"
cur_path = os.path.dirname(__file__) or '.'
sys.path.insert(0, cur_path + '/3rdparty')
diff --git a/mic/msger.py b/mic/msger.py
index f7131e1..f4856e7 100644
--- a/mic/msger.py
+++ b/mic/msger.py
@@ -217,6 +217,9 @@ class MicFileHandler(logging.FileHandler):
""" Log catched error message from stderr redirector """
if not self.errmsg:
return
+
+ if isinstance(self.errmsg, bytes):
+ self.errmsg = self.errmsg.decode()
sys.stdout.write(self.errmsg)
sys.stdout.flush()
diff --git a/packaging/mic.changes b/packaging/mic.changes
index 55d72de..a60559e 100644
--- a/packaging/mic.changes
+++ b/packaging/mic.changes
@@ -1,3 +1,7 @@
+* Wed Nov 01 2023 Biao Wang <biao716.wang@samsung.com> - 0.29.1
+ * Support opensuse15.x distro
+ * Port code from python2.x to python3.x
+
* Thu Apr 13 2023 Biao Wang <biao716.wang@samsung.com> - 0.28.19
* Fix mic create image error with rpm 4.14 if %prepackages section exists in ks file.
diff --git a/packaging/mic.spec b/packaging/mic.spec
index 85bfabc..310db64 100755
--- a/packaging/mic.spec
+++ b/packaging/mic.spec
@@ -6,7 +6,7 @@
Name: mic
Summary: Image Creator for Linux Distributions
-Version: 0.28.19
+Version: 0.29.1
Release: 0
Group: Development/Tools
License: GPLv2
diff --git a/tools/mic b/tools/mic
index 6cfcd49..e5e1e6d 100755
--- a/tools/mic
+++ b/tools/mic
@@ -271,6 +271,20 @@ def main(argv):
# Parse arguments
args = parser.parse_args(argv[1:])
+ #In python3.x version, if global opiton '-d' , '-v', '-i' is used, it will be not passed to mic create command.
+ #beside, there is same arguments in mic create command.
+ for debug_option in ('-d', '--debug'):
+ if debug_option in argv[1:]:
+ args.debug = True
+
+ for verbose_option in ('-v', '--verbose'):
+ if verbose_option in argv[1:]:
+ args.verbose = True
+ #for python3.x, args.interactive will always be True even using --non-interactive, that's because it is rewirte by option '-i'
+ #for '-i', use it, action is True, without it, default value is True.
+ if '--non-interactive' in argv[1:]:
+ args.interactive = False
+
if args.interactive:
msger.enable_interactive()
@@ -283,7 +297,7 @@ def main(argv):
if args.debug:
try:
import rpm
- rpm.setVerbosity(rpm.RPMLOG_DEBUG)
+ rpm.setVerbosity(rpm.RPMLOG_NOTICE)
except ImportError:
pass