From f4661591cc321d45ef4d74ebef14f733ac0dd34e Mon Sep 17 00:00:00 2001 From: Yiru Wang Mac Date: Mon, 13 Jul 2020 14:49:04 +0800 Subject: [PATCH 1/4] run test cases while building SPEC file, and solve the problem: AttributeError: 'NoneType' object has no attribute 'drop_database' --- packageship/packageship/application/initsystem/data_import.py | 2 ++ packageship/pkgship.spec | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packageship/packageship/application/initsystem/data_import.py b/packageship/packageship/application/initsystem/data_import.py index ccf4ea6b..e98b079b 100644 --- a/packageship/packageship/application/initsystem/data_import.py +++ b/packageship/packageship/application/initsystem/data_import.py @@ -665,6 +665,8 @@ class InitDataBase(): else: if not hasattr(self, '_sqlite_db'): self._sqlite_db = SqliteDatabaseOperations(db_name=db_name) + if getattr(self, '_sqlite_db') is None: + self._sqlite_db = SqliteDatabaseOperations(db_name=db_name) del_result = self._sqlite_db.drop_database() if del_result: diff --git a/packageship/pkgship.spec b/packageship/pkgship.spec index a48636ab..77f958eb 100644 --- a/packageship/pkgship.spec +++ b/packageship/pkgship.spec @@ -26,7 +26,7 @@ Pkgship implements rpm package dependence ,maintainer, patch query and so no. %check - +%{__python3} -m unittest test/run_tests.py %post #build cli bin -- Gitee From e6dae1c911e77b8f2e9fb9bbc8918f1b7bb05df2 Mon Sep 17 00:00:00 2001 From: Yiru Wang Mac Date: Mon, 13 Jul 2020 14:57:40 +0800 Subject: [PATCH 2/4] change comment line for default log path --- packageship/packageship/package.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packageship/packageship/package.ini b/packageship/packageship/package.ini index 96d09e2e..46444d84 100644 --- a/packageship/packageship/package.ini +++ b/packageship/packageship/package.ini @@ -51,7 +51,7 @@ dbtype=sqlite [LOG] ; Custom log storage path -; log_path=/var/run/pkgship +; log_path=/var/log/pkgship/ ; Logging level ; The log level option value can only be as follows -- Gitee From 93c5c9a2608bee3d1bf2ae4773a8bc128c03369a Mon Sep 17 00:00:00 2001 From: Yiru Wang Mac Date: Mon, 13 Jul 2020 15:07:21 +0800 Subject: [PATCH 3/4] add changelog --- packageship/pkgship.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packageship/pkgship.spec b/packageship/pkgship.spec index 77f958eb..c85191d2 100644 --- a/packageship/pkgship.spec +++ b/packageship/pkgship.spec @@ -1,6 +1,6 @@ Name: pkgship Version: 1.0 -Release: 2 +Release: 3 Summary: Pkgship implements rpm package dependence ,maintainer, patch query and so no. License: Mulan 2.0 URL: https://gitee.com/openeuler/openEuler-Advisor @@ -61,13 +61,16 @@ rm -rf %{python3_sitelib}/packageship/build %{python3_sitelib}/packageship/dist %changelog -* Sat JUL 4 2020 Yiru Wang - 1.0-2 +* Mon Jul 13 2020 Yiru Wang - 1.0-3 +- run test cases while building + +* Sat Jul 4 2020 Yiru Wang - 1.0-2 - cheange requires python3.7 to python3,add check pyinstaller file. -* Tue JUN 30 2020 Yiru Wang - 1.0-1 +* Tue Jun 30 2020 Yiru Wang - 1.0-1 - add pkgshipd file -* Tue Jun 11 2020 Feng Hu - 1.0-0 +* Thu Jun 11 2020 Feng Hu - 1.0-0 - add macro to build cli bin when rpm install * Sat Jun 6 2020 Feng Hu - 1.0-0 -- Gitee From c72453e1f89b1ed1019bb6fe442c309a0b88cf43 Mon Sep 17 00:00:00 2001 From: Yiru Wang Mac Date: Tue, 14 Jul 2020 17:05:52 +0800 Subject: [PATCH 4/4] clean code --- packageship/packageship/application/initsystem/data_import.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packageship/packageship/application/initsystem/data_import.py b/packageship/packageship/application/initsystem/data_import.py index e98b079b..94d76dad 100644 --- a/packageship/packageship/application/initsystem/data_import.py +++ b/packageship/packageship/application/initsystem/data_import.py @@ -663,9 +663,7 @@ class InitDataBase(): if self.db_type == 'mysql': del_result = MysqlDatabaseOperations.drop_database(db_name) else: - if not hasattr(self, '_sqlite_db'): - self._sqlite_db = SqliteDatabaseOperations(db_name=db_name) - if getattr(self, '_sqlite_db') is None: + if not hasattr(self, '_sqlite_db') or getattr(self, '_sqlite_db') is None: self._sqlite_db = SqliteDatabaseOperations(db_name=db_name) del_result = self._sqlite_db.drop_database() -- Gitee