From a18f770937d259370bd4292e55a105cbbb3adb31 Mon Sep 17 00:00:00 2001 From: Xinwei Hu Date: Tue, 12 Sep 2023 15:08:19 +0800 Subject: [PATCH] Further changes to support metacpan --- advisors/check_upstream.py | 19 ++++++++++--------- advisors/check_version.py | 5 ++++- upstream-info/perl-Crypt-X509.yaml | 5 +++++ 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 upstream-info/perl-Crypt-X509.yaml diff --git a/advisors/check_upstream.py b/advisors/check_upstream.py index a90c9e36..8a324929 100755 --- a/advisors/check_upstream.py +++ b/advisors/check_upstream.py @@ -251,7 +251,7 @@ def check_metacpan(info, clean_tag=True): last_query = {"time_stamp": datetime.now(), "raw_data": resp} info["last_query"] = last_query - tags = [] + tags = {} tag = None tags_json = json.loads(resp) if "version" in tags_json: @@ -261,8 +261,8 @@ def check_metacpan(info, clean_tag=True): elif "version_numified" in tags_json: tag = str(tags_json["version_numified"]) if tag: - tag = tag.lstrip('0').rstrip('0') - tags.append(tag) + tag = tag.rstrip('0') + tags[tag] = datetime.now() if clean_tag: tags = clean_tags(tags, info) @@ -438,14 +438,15 @@ def __svn_resp_to_tags(resp): if 'Redirecting' in line: continue items = line.split() - create_date = items[2:5] - tag = items[5] - tag = tag[:-1] try: + create_date = items[2:5] date = datetime.strptime(",".join(create_date), "%b,%d,%Y") - tags[tag] = date - except ValueError: - tags[tag]=None + except: + date = datetime.now() + + tag = items[-1] + tag = tag[:-1] + tags[tag] = date return tags diff --git a/advisors/check_version.py b/advisors/check_version.py index 1cc5aaae..383e1064 100755 --- a/advisors/check_version.py +++ b/advisors/check_version.py @@ -49,7 +49,10 @@ def main(): total = len(repos) index = 0 upgrade_list = [] - for check_repo in repos: + for repo in repos: + if repo.startswith('openeuler/'): + continue + check_repo = repo[len('src-openeuler/'):] index = index + 1 result = main_process(args.push, args.default, check_repo) if result: diff --git a/upstream-info/perl-Crypt-X509.yaml b/upstream-info/perl-Crypt-X509.yaml new file mode 100644 index 00000000..8475540d --- /dev/null +++ b/upstream-info/perl-Crypt-X509.yaml @@ -0,0 +1,5 @@ +version_control: metacpan +src_repo: Crypt-X509 +tag_prefix: +separator: . + -- Gitee