diff --git a/packageship/packageship/application/apps/package/serialize.py b/packageship/packageship/application/apps/package/serialize.py index ac86ce9aaeed9629ca35393da5b4656d4608173a..8e271e3187dbab59a903c8b9f2306a560bb39c52 100644 --- a/packageship/packageship/application/apps/package/serialize.py +++ b/packageship/packageship/application/apps/package/serialize.py @@ -186,4 +186,4 @@ class InitSystemSchema(Schema): """ configfile = fields.Str( validate=validate.Length( - max=50), required=False, allow_none=True) + max=500), required=False, allow_none=True) diff --git a/packageship/packageship/pkgship.py b/packageship/packageship/pkgship.py index d5308e5f1fe17a81efdb15d985a11682a49fcf9f..59c76623508f31bec5475f1f1a25ccab9cf8a73b 100644 --- a/packageship/packageship/pkgship.py +++ b/packageship/packageship/pkgship.py @@ -465,6 +465,7 @@ class InitDatabaseCommand(PkgshipCommand): """ file_path = params.filepath try: + file_path = os.path.abspath(file_path) response = requests.post(self.write_host + '/initsystem', data=json.dumps({'configfile': file_path}), headers=self.headers) diff --git a/packageship/pkgship.spec b/packageship/pkgship.spec index 38a8c2214efe9584ff323184d6a222d9d76bc64d..f72bf57182e859a3396e873546363d50cacdc06c 100644 --- a/packageship/pkgship.spec +++ b/packageship/pkgship.spec @@ -1,6 +1,6 @@ Name: pkgship Version: 1.0.0 -Release: 6 +Release: 7 Summary: Pkgship implements rpm package dependence ,maintainer, patch query and so no. License: Mulan 2.0 URL: https://gitee.com/openeuler/openEuler-Advisor @@ -28,7 +28,7 @@ Pkgship implements rpm package dependence ,maintainer, patch query and so no. %check -# change log_path to solve default log_path permission denied problem +# change log_path to solve default log_path permission denied problem log_path=`pwd`/tmp/ sed -i "/\[LOG\]/a\log_path=$log_path" test/common_files/package.ini %{__python3} -m unittest test/run_tests.py @@ -60,7 +60,7 @@ rm -rf %{python3_sitelib}/packageship/build %{python3_sitelib}/packageship/dist %files -%doc README.md +%doc README.md %{python3_sitelib}/* %config %{_sysconfdir}/pkgship/* %attr(0755,root,root) %{_bindir}/pkgshipd @@ -68,6 +68,9 @@ rm -rf %{python3_sitelib}/packageship/build %{python3_sitelib}/packageship/dist %changelog +* Fri Aug 21 2020 Chengqiang Bao < baochengqiang1@huawei.com > - 1.0.0-7 +- Fixed a problem with command line initialization of the Filepath parameter where relative paths are not supported and paths are too long + * Wed Aug 12 2020 Zhang Tao - 1.0.0-6 - Fix the test content to adapt to the new data structure, add BuildRequires for running %check