Merge from devel

Change-Id: I7fd81a8aa94cf25071b2b9911ee868656ca1d6a5
Signed-off-by: wangbiao <biao716.wang@samsung.com>

diff --cc .sam-dir/log/sam.log_20240618
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..24287813ee57777c1a09e531e1b36cdeac2a09eb
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/.sam-dir/log/sam.log_20240618
@@@ -1,0 -1,0 +1,16 @@@
++SAM:INFO:2024-06-18,17:14:59:engine_factory.py: 39> Engines for language python are created: ['SAMEngineRadon', 'SAMEnginePmdcpd']
++SAM:ERROR:2024-06-18,17:14:59: sam_errors.py: 44> 
++======================================================================
++  ERROR OCCURRED  
++======================================================================
++| Error code: SAM-CM-01
++|
++| Directory /srv/wangbiao/SAM/mic/.sam-dir is not empty, but it is not for SAM Directory
++|
++| Help message:
++|    Please check the error message.
++======================================================================
++Please follow the guide in the help message to resolve the issue.
++======================================================================
++
++SAM:INFO:2024-06-18,17:15:00:request_util_runner.py: 32> b"HTTPSConnectionPool(host='analysishub.sec.samsung.net', port=443): Max retries exceeded with url: /sam/stats/ (Caused by SSLError(SSLError(1, '[SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:645)'),))\n"

diff --cc .sam-dir/sam-history.json
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..6b48c5ecd3b60f1a8292d8dcaa9091b2d810f5d9
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/.sam-dir/sam-history.json
@@@ -1,0 -1,0 +1,1 @@@
++{"histories": [{"cwd": "/srv/wangbiao/SAM/mic", "options": {"version": false, "action": "scan", "build_command": [], "language": "PYTHON", "sam_dir": ".sam-dir", "source_path": "/srv/wangbiao/SAM/scm_CQM/mic", "log_level": "INFO", "svace_path": null, "exclude": null, "pmd_heap_size": null, "only_pmd": false, "skip_pmd": false, "skip_svace": false, "script_scra": false, "py_relation": false, "clean_command": "", "pmd_use_built_path": false}, "args": ["/srv/wangbiao/SAM/SAM_v7.3.0-linux/bin/__init__.py", "scan", "--language", "python", "--source-path", "/srv/wangbiao/SAM/scm_CQM/mic"], "timestamp": 1718698499665.9834}]}

diff --cc mic/3rdparty/pykickstart/parser.py
Simple merge

diff --cc mic/utils/misc.py
index 1c352f2cb86596faa679c7fa4980ea80a54442f7,b52b61781fdf60827ea2385372706d27f051ecd2..b0ee1d8cad444dbb0cd87095c1f9f056e4f4cc6b
mode 100755,100644..100644
--- 1/mic/utils/misc.py
--- 2/mic/utils/misc.py
+++ b/mic/utils/misc.py

diff --cc mic/utils/rpmmisc.py
index ae84ffdc3fc936405df21f6eff36f9698562ce30,210d0b302368d728e7e271ccda7c67c519e86139..dba0ec3f756d2852fe4facbbb70cea5fadae3db6
--- 1/mic/utils/rpmmisc.py
--- 2/mic/utils/rpmmisc.py
+++ b/mic/utils/rpmmisc.py
@@@ -114,10 -114,10 +114,10 @@@ class RPMInstallCallback
                      rpmloc = h
                      hdr = readRpmHeader(self.ts, h)
  
-                 m = re.match("(.*)-(\d+.*)-(\d+\.\d+)\.(.+)\.rpm", os.path.basename(rpmloc))
-                 #if m:
+                 m = re.match(r"(.*)-(\d+.*)-(\d+\.\d+)\.(.+)\.rpm", os.path.basename(rpmloc))
+                 if m:
                      pkgname = m.group(1)
 -                else:
 +                #else:
                      pkgname = os.path.basename(rpmloc)
                  msger.info("Next install: %s " % pkgname)
  
@@@ -163,15 -163,15 +163,15 @@@
                      except:
                          rpmloc = h
  
-                     m = re.match("(.*)-(\d+.*)-(\d+\.\d+)\.(.+)\.rpm", os.path.basename(rpmloc))
-                     #if m:
+                     m = re.match(r"(.*)-(\d+.*)-(\d+\.\d+)\.(.+)\.rpm", os.path.basename(rpmloc))
+                     if m:
                          pkgname = m.group(1)
 -                    else:
 +                    #else:
                          pkgname = os.path.basename(rpmloc)
 -                if self.output:
 +                #if self.output:
                      fmt = self._makefmt(percent)
                      msg = fmt % (self.headmsg, pkgname)
 -                    if msg != self.lastmsg:
 +                    #if msg != self.lastmsg:
                          self.lastmsg = msg
  
                          msger.info(msg)

diff --cc plugins/imager/raw_plugin.py
Simple merge