diff --git a/packageship/packageship/application/initsystem/data_import.py b/packageship/packageship/application/initsystem/data_import.py index ccf4ea6b96903c5231832e68d38f8af61c868f97..94d76dad0d61df83903a4236142654cb3566db14 100644 --- a/packageship/packageship/application/initsystem/data_import.py +++ b/packageship/packageship/application/initsystem/data_import.py @@ -663,7 +663,7 @@ class InitDataBase(): if self.db_type == 'mysql': del_result = MysqlDatabaseOperations.drop_database(db_name) else: - if not hasattr(self, '_sqlite_db'): + 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() diff --git a/packageship/packageship/package.ini b/packageship/packageship/package.ini index 96d09e2e9fd6eb72c2540abd4dfb8cd94ffe9565..46444d84ca9ccef4c0ebfebd48087495c908a1c2 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 diff --git a/packageship/pkgship.spec b/packageship/pkgship.spec index a48636ab1a91fe0d417401d62725b288499f42e7..c85191d2d299f69958b689bbd9e4d00893d0a79c 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 @@ -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 @@ -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