diff --git a/README.en.md b/README.en.md index c3f81c9ff8874ef5207d2d9ce1f25d959c862768..aaa24e27e0630bd249f062bd70a97b7c5573564a 100644 --- a/README.en.md +++ b/README.en.md @@ -29,12 +29,16 @@ usage: kyclassifier -h -iso ISO_FILE_PATH -repo -local + -console_log + -q_rpminiso optional arguments: -h, --help show this help message and exit -iso ISO Input ISO file path -repo Whether to analyze repo packages. -local Whether to analyze local installed packages. + -console_log Output log to console. + -q_rpminiso Query input rpm layer in iso #### Contribution diff --git a/README.md b/README.md index 46854ac7cad3235b41c631ba303d9accd165f3ae..7a9b470cfb6faad152b0b2ef6c8277cbff5fa170 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ usage: kyclassifier -h -repo -local -console_log + -q_rpminiso optional arguments: -h, --help show this help message and exit @@ -39,6 +40,7 @@ optional arguments: -repo Whether to analyze repo packages. -local Whether to analyze local installed packages. -console_log Output log to console. + -q_rpminiso Query input rpm layer in iso #### 参与贡献 diff --git a/main.py b/main.py index dd742ef595bf4ee27fbf49d62dd5d07dbb0f5c00..6748a5c4e3eebac0c62f91bd4e717a5b913eba3f 100644 --- a/main.py +++ b/main.py @@ -140,7 +140,7 @@ if __name__ == '__main__': if args.q_rpminiso: layer = QueryLayerInIso.run(args.q_rpminiso) if layer < 0: - logger.info("Check error,skipped query rpm layer in iso.") + logger.error("Check error,skipped query rpm layer in iso.") else: logger.info("Rpm layer in iso is {}".format(layer)) diff --git a/test/test_localcheck.py b/test/test_localcheck.py index e42986953ab86f3c10d69bc884e3c5feaf6fffdd..03274466e61e0d7e7102f5418d979051112c955d 100644 --- a/test/test_localcheck.py +++ b/test/test_localcheck.py @@ -38,6 +38,15 @@ class TestLocalCheck(unittest.TestCase): result = self.local_check.check_pkgsmissreq() self.assertIsInstance(result, dict, "check_pkgsmissreq test failed!") + def test_check_pkgsconflicts(self): + """Test class method check_pkgsconflicts() + + Returns: + bool + """ + result = self.local_check.check_pkgsconflicts() + self.assertIsInstance(result, dict, "check_pkgsconflicts test failed!") + def test_check(self): """Test class method check()