From 52d28800b3fa4109a85e16a45cc8930e51315534 Mon Sep 17 00:00:00 2001 From: Zhangyifan Date: Mon, 7 Sep 2020 11:07:07 +0800 Subject: [PATCH 1/3] I1TYJV-generate_pwd_count --- patch-tracking/patch_tracking/cli/generate_password | 1 + 1 file changed, 1 insertion(+) diff --git a/patch-tracking/patch_tracking/cli/generate_password b/patch-tracking/patch_tracking/cli/generate_password index f9d91f0c..25eb2131 100644 --- a/patch-tracking/patch_tracking/cli/generate_password +++ b/patch-tracking/patch_tracking/cli/generate_password @@ -73,6 +73,7 @@ def password_strength_check(password): if __name__ == "__main__": if len(sys.argv) != 2: usage() + print("Error: One password input allowed.") sys.exit(1) password_ = sys.argv[1] -- Gitee From 6f6c341deb5ae35b36b246dbe4afb9e36c286512 Mon Sep 17 00:00:00 2001 From: Zhangyifan Date: Mon, 7 Sep 2020 14:40:50 +0800 Subject: [PATCH 2/3] I1U54H_readme-fix --- patch-tracking/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/patch-tracking/README.md b/patch-tracking/README.md index 746f3cb0..dead6a2a 100644 --- a/patch-tracking/README.md +++ b/patch-tracking/README.md @@ -186,17 +186,17 @@ pbkdf2:sha256:150000$w38eLeRm$ebb5069ba3b4dda39a698bd1d9d7f5f848af3bd93b11e0cde2 --branch ：需要进行跟踪的仓库的分支名称 \ --scm_repo ：被跟踪的上游仓库的仓库名称，github格式：组织/仓库 \ --scm_branch： 被跟踪的上游仓库的仓库的分支 \ ---enable ：是否自动跟踪该仓库 +--enabled ：是否自动跟踪该仓库 例如： ```shell script -patch-tracking-cli add --server 127.0.0.1:5001 --user admin --password Test@123 --version_control github --repo testPatchTrack/testPatch1 --branch master --scm_repo BJMX/testPatch01 --scm_branch test --enable true +patch-tracking-cli add --server 127.0.0.1:5001 --user admin --password Test@123 --version_control github --repo testPatchTrack/testPatch1 --branch master --scm_repo BJMX/testPatch01 --scm_branch test --enabled true ``` ### 指定文件添加 参数含义： ->--server ：启动Patch Tracking服务的URL，例如：127.0.0.1:5001 \ +>--server ：启动Patch Tracking服务的URL，例如：127.0.0.1:5001 \ --user ：POST接口需要进行认证的用户名，同settings.conf中的USER参数 \ --password ：POST接口需要进行认证的口令，为settings.conf中的PASSWORD哈希值对应的实际的口令字符串 \ --file ：yaml文件路径 @@ -224,7 +224,7 @@ scm_repo ：被跟踪的上游仓库的仓库名称，github格式：组织/仓 scm_branch ：被跟踪的上游仓库的仓库的分支 \ repo ：需要进行跟踪的仓库名称，格式：组织/仓库 \ branch ：需要进行跟踪的仓库的分支名称 \ -enable ：是否自动跟踪该仓库 +enabled ：是否自动跟踪该仓库 ### 指定目录添加 @@ -268,7 +268,7 @@ patch-tracking-cli query --server 127.0.0.1:5001 --table issue ## 删除跟踪项 ```shell script -patch-tracking-cli delete --server SERVER --user USER --password PWD --table TABLE --repo REPO [--branch BRANCH] +patch-tracking-cli delete --server SERVER --user USER --password PWD --repo REPO [--branch BRANCH] ``` 例如： ```shell script -- Gitee From 5ea2dea6927b784d0e2d77a57322df56a7eec366 Mon Sep 17 00:00:00 2001 From: chenyanpan Date: Mon, 7 Sep 2020 17:57:08 +0800 Subject: [PATCH 3/3] version 1.0.1 --- patch-tracking/patch-tracking.spec | 33 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/patch-tracking/patch-tracking.spec b/patch-tracking/patch-tracking.spec index 7a6d92e8..8605d073 100644 --- a/patch-tracking/patch-tracking.spec +++ b/patch-tracking/patch-tracking.spec @@ -1,19 +1,12 @@ -%define name patch-tracking -%define version 1.0.0 -%define release 2 - -Summary: This is a tool for automatically tracking upstream repository code patches -Name: %{name} -Version: %{version} -Release: %{release} -Source0: %{name}-%{version}.tar -License: Mulan PSL v2 -Group: Development/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Prefix: %{_prefix} -BuildArch: noarch -Vendor: ChenYanpan -Url: https://openeuler.org/zh/ +Summary: This is a tool for automatically tracking upstream repository code patches +Name: patch-tracking +Version: 1.0.1 +Release: 1 +License: Mulan PSL v2 +URL: https://gitee.com/openeuler/openEuler-Advisor +Source0: https://gitee.com/openeuler/openEuler-Advisor/tree/master/patch-tracking +BuildArch: noarch + BuildRequires: python3-setuptools # Requires: python3.7 python3-flask python3-sqlalchemy python3-requests @@ -22,7 +15,7 @@ BuildRequires: python3-setuptools This is a tool for automatically tracking upstream repository code patches %prep -%setup -n %{name}-%{version} +%setup -n patch-tracking-%{version} %build %py3_build @@ -54,3 +47,9 @@ rm -rf $RPM_BUILD_ROOT /var/patch-tracking/db.sqlite /usr/bin/generate_password /usr/lib/systemd/system/patch-tracking.service + + +%changelog +* Mon Sep 07 2020 chenyanpan - 1.0.1-1 +- Type: bugfix +- DESC: fixed issues -- Gitee