diff --git a/advisors/check_upstream.py b/advisors/check_upstream.py index 58fe743c7554469a4c0fe19400a979d3754f2bee..3aeabea87de3de193230986a09b7ed9714d8349d 100755 --- a/advisors/check_upstream.py +++ b/advisors/check_upstream.py @@ -436,7 +436,7 @@ def check_ftp(info, clean_tag=True): url = yaml2url.yaml2url(info) eprint("{repo} > List ftp directory".format(repo=url)) - resp = get_resp.get(url, headers=headers) + resp = get_resp(url, headers=headers) if not resp: return "" diff --git a/advisors/check_version.py b/advisors/check_version.py index 57e04a25643fc05dc369d03ccbe47264b05f6803..f46cd95e21a25f38ff0f9cfc82f738138ad39f75 100755 --- a/advisors/check_version.py +++ b/advisors/check_version.py @@ -58,25 +58,36 @@ def main(): time.sleep(10) result = main_process(args.push, args.default, check_repo) if result: - print('''INFO: {index} in {total} check {repo} need upgrade \ + if result[1] != result[2]: + print('''INFO: {index} in {total} check {repo} need upgrade \ from {current} to {latest}'''.format(index=index, - total=total, - repo=result[0], - current=result[1], - latest=result[2])) - upgrade_list.append(result) - else: - print('''INFO: {index} in {total} check {repo} not need \ + total=total, + repo=result[0], + current=result[1], + latest=result[2])) + result.append('Y') + upgrade_list.append(result) + else: + result.append('N') + upgrade_list.append(result) + print('''INFO: {index} in {total} check {repo} not need \ upgrade'''.format(index=index, - total=total, - repo=check_repo)) + total=total, + repo=check_repo)) + else: + upgrade_list.append([check_repo, '-', '-', '-']) + print('''INFO: {index} in {total} check {repo} \ +latest version failed.'''.format(index=index, + total=total, + repo=check_repo)) if upgrade_list: - print("The repos listed below need upgrade:") + print("Repo upgrade check result:") for upgrade_repo in upgrade_list: - print("{repo} {current} {latest}".format(repo=upgrade_repo[0], - current=upgrade_repo[1], - latest=upgrade_repo[2])) + print("{repo} {current} {latest} {upgrade}".format(repo=upgrade_repo[0], + current=upgrade_repo[1], + latest=upgrade_repo[2], + upgrade=upgrade_repo[3])) if __name__ == "__main__": diff --git a/advisors/oa_upgradable.py b/advisors/oa_upgradable.py index 80624bd53e6b1b7ddcb9c0a971823ec86eb8ce22..6761fea64d93cc1a78e5a270e3675425ae9cf0b1 100755 --- a/advisors/oa_upgradable.py +++ b/advisors/oa_upgradable.py @@ -187,8 +187,8 @@ If you think this is not proper issue, Please visit https://gitee.com/openeuler/ Issues and feedbacks are welcome.""".format(repo=repo, ver=ver_rec.latest_version, cur_ver=cur_version)) - return repo, cur_version, ver_rec.latest_version - return None + return [repo, cur_version, ver_rec.latest_version] + if __name__ == "__main__": diff --git a/upstream-info/google-noto-fonts.yaml b/upstream-info/google-noto-fonts.yaml new file mode 100644 index 0000000000000000000000000000000000000000..1f8a32043d76c6844beb4b5c3de0d052d5a4551d --- /dev/null +++ b/upstream-info/google-noto-fonts.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: googlefonts/noto-fonts +tag_prefix: "^v" +separator: "." +url: https://github.com/googlefonts/noto-fonts.git diff --git a/upstream-info/jcommon.yaml b/upstream-info/jcommon.yaml new file mode 100644 index 0000000000000000000000000000000000000000..5ee00aba4c37aa97ed0f45d13f860c45705bf52c --- /dev/null +++ b/upstream-info/jcommon.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: jfree/jcommon +tag_prefix: "^v" +separator: "." +git_url: https://github.com/jfree/jcommon.git diff --git a/upstream-info/jdo-api.yaml b/upstream-info/jdo-api.yaml new file mode 100644 index 0000000000000000000000000000000000000000..78ffb2c5e9e4ac8eb49ad35be70633b0dd2da851 --- /dev/null +++ b/upstream-info/jdo-api.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: apache/db-jdo +tag_prefix: "^v" +separator: "." +git_url: https://github.com/apache/db-jdo.git diff --git a/upstream-info/jets3t.yaml b/upstream-info/jets3t.yaml new file mode 100644 index 0000000000000000000000000000000000000000..7d95c1ad6015928922637a338d32b91d1daf5616 --- /dev/null +++ b/upstream-info/jets3t.yaml @@ -0,0 +1,6 @@ +version_control: github +src_repo: iterate-ch/jets3t +tag_prefix: "^Release-" +separator: "." +git_url: https://github.com/iterate-ch/jets3t.git + diff --git a/upstream-info/jhighlight.yaml b/upstream-info/jhighlight.yaml new file mode 100644 index 0000000000000000000000000000000000000000..6e4c92a9d01ecd663a6df9c9b7219c090b499362 --- /dev/null +++ b/upstream-info/jhighlight.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: codelibs/jhighlight +tag_prefix: "^jhighlight-" +separator: "." +git_url: https://github.com/codelibs/jhighlight.git diff --git a/upstream-info/kronosnet.yaml b/upstream-info/kronosnet.yaml new file mode 100644 index 0000000000000000000000000000000000000000..6a2303ffb1603bc5aac8b0e2042bf9dcceda7395 --- /dev/null +++ b/upstream-info/kronosnet.yaml @@ -0,0 +1,6 @@ +version_control: github +src_repo: kronosnet +src_repo: kronosnet/kronosnet +tag_prefix: "^v" +separator: "." +url: https://github.com/kronosnet/kronosnet.git diff --git a/upstream-info/libtdb.yaml b/upstream-info/libtdb.yaml index bc78ec3dfe8c4e8522c24bb8e35c141b4f76b2d5..720018e35f7ab8d33e0fa6a981ccb1cdd3fb09d2 100644 --- a/upstream-info/libtdb.yaml +++ b/upstream-info/libtdb.yaml @@ -1,15 +1,6 @@ --- version_control: github -src_repo: nkadel/libtdb-1.4.x-srpm -tag_prefix: "^v" +src_repo: samba-team/samba +tag_prefix: "^tdb-" separator: "." -git_url: https://github.com/nkadel/libtdb-1.4.x-srpm.git -git_tag: -- 2020-02-02 v1.4.3-0 -- 2019-08-21 v1.4.2-0 -- 2019-04-18 v1.3.18-0.2 -- 2018-11-25 v1.3.16-0.1 -- 2018-08-10 v1.3.16-0 -- 2018-07-09 v1.3.15-0 -- 2013-07-05 v1.2.12-0.1 -- 2013-02-20 v1.2.11-1 +git_url: https://github.com/samba-team/samba.git diff --git a/upstream-info/nodejs-es5-ext.yaml b/upstream-info/nodejs-es5-ext.yaml new file mode 100644 index 0000000000000000000000000000000000000000..7ad8653af2256ebc77a7c879d7a48c5f56081d71 --- /dev/null +++ b/upstream-info/nodejs-es5-ext.yaml @@ -0,0 +1,6 @@ +version_control: github +src_repo: medikoo/es5-ext +tag_prefix: "^v" +separator: "." +git_url: https://github.com/medikoo/es5-ext.git + diff --git a/upstream-info/nodejs-faye-websocket.yaml b/upstream-info/nodejs-faye-websocket.yaml new file mode 100644 index 0000000000000000000000000000000000000000..2764b017622888741bdb6b8c4135a54731992cd4 --- /dev/null +++ b/upstream-info/nodejs-faye-websocket.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: faye/faye-websocket-node +tag_prefix: "" +separator: "." +git_url: https://github.com/faye/faye-websocket-node.git diff --git a/upstream-info/nodejs-formatio.yaml b/upstream-info/nodejs-formatio.yaml new file mode 100644 index 0000000000000000000000000000000000000000..13e83f5040fffc93713c11170f28541b2888510e --- /dev/null +++ b/upstream-info/nodejs-formatio.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: sinonjs/formatio +tag_prefix: "^v" +separator: "." +git_url: https://github.com/sinonjs/formatio.git diff --git a/upstream-info/nodejs-graceful-readlink.yaml b/upstream-info/nodejs-graceful-readlink.yaml new file mode 100644 index 0000000000000000000000000000000000000000..cce33340d5bbfd91d0095ebe3fb1b4d0e3d5e127 --- /dev/null +++ b/upstream-info/nodejs-graceful-readlink.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: zhiyelee/graceful-readlink +tag_prefix: "^" +separator: "." +git_url: https://github.com/zhiyelee/graceful-readlink.git diff --git a/upstream-info/nodejs-gzip-size.yaml b/upstream-info/nodejs-gzip-size.yaml new file mode 100644 index 0000000000000000000000000000000000000000..03b0157467ed3a1f7b71f071eac5c36949799584 --- /dev/null +++ b/upstream-info/nodejs-gzip-size.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: sindresorhus/gzip-size +tag_prefix: "^v" +separator: "." +git_url: https://github.com/sindresorhus/gzip-size.git diff --git a/upstream-info/nodejs-is-builtin-module.yaml b/upstream-info/nodejs-is-builtin-module.yaml new file mode 100644 index 0000000000000000000000000000000000000000..7aad871a4ab0491c5e00b5d7bd9cc22526512f48 --- /dev/null +++ b/upstream-info/nodejs-is-builtin-module.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: sindresorhus/is-builtin-module +tag_prefix: "^v" +separator: "." +git_url: https://github.com/sindresorhus/is-builtin-module.git diff --git a/upstream-info/nodejs-lolex.yaml b/upstream-info/nodejs-lolex.yaml new file mode 100644 index 0000000000000000000000000000000000000000..4906daac9a025f6d19b9f22016d580a4f7a5f36f --- /dev/null +++ b/upstream-info/nodejs-lolex.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: sinonjs/fake-timers +tag_prefix: "^v" +separator: "." + diff --git a/upstream-info/nodejs-sinon.yaml b/upstream-info/nodejs-sinon.yaml new file mode 100644 index 0000000000000000000000000000000000000000..dd707369e48a7e31b67388577dd73b45597e76c2 --- /dev/null +++ b/upstream-info/nodejs-sinon.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: cjohansen/Sinon.JS +tag_prefix: "^v" +separator: "." diff --git a/upstream-info/nodejs-slide.yaml b/upstream-info/nodejs-slide.yaml new file mode 100644 index 0000000000000000000000000000000000000000..0a4467e451a4a0ad022c94af8fc1eea2e1cf4cf2 --- /dev/null +++ b/upstream-info/nodejs-slide.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: isaacs/slide-flow-control +tag_prefix: "^v" +separator: "." + diff --git a/upstream-info/nodejs-sntp.yaml b/upstream-info/nodejs-sntp.yaml new file mode 100644 index 0000000000000000000000000000000000000000..bc044d22c16bab8df00a2a25604162231a782580 --- /dev/null +++ b/upstream-info/nodejs-sntp.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: hueniverse/sntp +tag_prefix: "^v" +separator: "." diff --git a/upstream-info/nodejs-source-map.yaml b/upstream-info/nodejs-source-map.yaml new file mode 100644 index 0000000000000000000000000000000000000000..feb0b647d88175ee5323083bc43636917d5b57a2 --- /dev/null +++ b/upstream-info/nodejs-source-map.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: mozilla/source-map +tag_prefix: "" +separator: "." diff --git a/upstream-info/nodejs-spdx-exceptions.yaml b/upstream-info/nodejs-spdx-exceptions.yaml new file mode 100644 index 0000000000000000000000000000000000000000..b105b5316032e9fd7840bfc39c5e2ddc0d4ba95a --- /dev/null +++ b/upstream-info/nodejs-spdx-exceptions.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: jslicense/spdx-exceptions.json +tag_prefix: "^v" +separator: "." + diff --git a/upstream-info/nodejs-tunnel-agent.yaml b/upstream-info/nodejs-tunnel-agent.yaml new file mode 100644 index 0000000000000000000000000000000000000000..bbee683302aeb128a04f1af501ab7cc9b73046f1 --- /dev/null +++ b/upstream-info/nodejs-tunnel-agent.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: request/tunnel-agent +tag_prefix: "^v" +separator: "." diff --git a/upstream-info/portreserve.yaml b/upstream-info/portreserve.yaml index 12e95ea8af9e69b094863fa5f7ad87a36e2f64db..5a8a21acdfaaa873d572b332767fc68b4a68d37c 100644 --- a/upstream-info/portreserve.yaml +++ b/upstream-info/portreserve.yaml @@ -1,7 +1,6 @@ ---- version_control: git src_repo: https://pagure.io/portreserve.git -tag_prefix: "^" +tag_prefix: "" separator: "." git_url: https://pagure.io/portreserve.git git_tag: diff --git a/upstream-info/proxytoys.yaml b/upstream-info/proxytoys.yaml new file mode 100644 index 0000000000000000000000000000000000000000..805f32bd0acddcc0f6e082087653767bc4deb0ab --- /dev/null +++ b/upstream-info/proxytoys.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: proxytoys/proxytoys +tag_prefix: "" +separator: "." diff --git a/upstream-info/python-scons.yaml b/upstream-info/python-scons.yaml new file mode 100644 index 0000000000000000000000000000000000000000..88ab07d312752252e92a87507184331d2e5f5d02 --- /dev/null +++ b/upstream-info/python-scons.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: SCons/scons +tag_prefix: ^v +separator: . diff --git a/upstream-info/rubygem-redis.yaml b/upstream-info/rubygem-redis.yaml new file mode 100644 index 0000000000000000000000000000000000000000..c3bff7c2fb90af6e20cf38582658b060b4dc58a4 --- /dev/null +++ b/upstream-info/rubygem-redis.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: redis/redis-rb +tag_prefix: "^v" +separator: "." +git_url: https://github.com/redis/redis-rb.git diff --git a/upstream-info/rubygem-slop.yaml b/upstream-info/rubygem-slop.yaml new file mode 100644 index 0000000000000000000000000000000000000000..b26b1e3a88407e70c2d5de351a747942e2e99553 --- /dev/null +++ b/upstream-info/rubygem-slop.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: leejarvis/slop +tag_prefix: "^v" +separator: "." + diff --git a/upstream-info/rubygem-sqlite3.yaml b/upstream-info/rubygem-sqlite3.yaml new file mode 100644 index 0000000000000000000000000000000000000000..bbd7ffedf81c29a097b2c7d0ab99edc4dd822b86 --- /dev/null +++ b/upstream-info/rubygem-sqlite3.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: sparklemotion/sqlite3-ruby +tag_prefix: "^v" +separator: "." diff --git a/upstream-info/rubygem-ttfunk.yaml b/upstream-info/rubygem-ttfunk.yaml new file mode 100644 index 0000000000000000000000000000000000000000..c6e111d68727f59cec9da3f845c9e93a718c7bcd --- /dev/null +++ b/upstream-info/rubygem-ttfunk.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: prawnpdf/ttfunk +tag_prefix: "" +separator: "." diff --git a/upstream-info/rubygem-turbolinks-source.yaml b/upstream-info/rubygem-turbolinks-source.yaml new file mode 100644 index 0000000000000000000000000000000000000000..a786ccd7efba06d4ae040334a1da43837c367fec --- /dev/null +++ b/upstream-info/rubygem-turbolinks-source.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: turbolinks/turbolinks-source-gem +tag_prefix: "^v" +separator: "." + diff --git a/upstream-info/rubygem-turbolinks.yaml b/upstream-info/rubygem-turbolinks.yaml new file mode 100644 index 0000000000000000000000000000000000000000..5b366de3fd03b9930eb2cff21c44ec9893477711 --- /dev/null +++ b/upstream-info/rubygem-turbolinks.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: turbolinks/turbolinks +tag_prefix: "^v" +separator: "." diff --git a/upstream-info/rubygem-unf_ext.yaml b/upstream-info/rubygem-unf_ext.yaml new file mode 100644 index 0000000000000000000000000000000000000000..a66c15ccacc08d40816102253ba5f571d9705e86 --- /dev/null +++ b/upstream-info/rubygem-unf_ext.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: knu/ruby-unf_ext +tag_prefix: "^v" +separator: "." diff --git a/upstream-info/soundtouch.yaml b/upstream-info/soundtouch.yaml index a6ed8e11c6b0d1dd2e0b87aeb8c7969c9b0ed379..bd0024d9832b3a196f2df6e3eac5357566349beb 100644 --- a/upstream-info/soundtouch.yaml +++ b/upstream-info/soundtouch.yaml @@ -1,9 +1,5 @@ ---- version_control: git -src_repo: https://gitlab.com/soundtouch/soundtouch.git -tag_prefix: "^" -separator: "." -git_url: https://gitlab.com/soundtouch/soundtouch.git -git_tag: -- 2018-12-02 2.1.2 -- 2018-11-14 2.1.1 +src_repo: https://codeberg.org/soundtouch/soundtouch.git +tag_prefix: "" +separator: . +git_url: https://codeberg.org/soundtouch/soundtouch.git diff --git a/upstream-info/tycho-extras.yaml b/upstream-info/tycho-extras.yaml new file mode 100644 index 0000000000000000000000000000000000000000..476cd4cbadf71b6a1b46d27d8983a5c3b095967d --- /dev/null +++ b/upstream-info/tycho-extras.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: eclipse/tycho +tag_prefix: "^tycho-" +separator: "." + diff --git a/upstream-info/tycho.yaml b/upstream-info/tycho.yaml new file mode 100644 index 0000000000000000000000000000000000000000..e078fd172cb510c334fd9c3f46338263c87ddbec --- /dev/null +++ b/upstream-info/tycho.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: eclipse/tycho +tag_prefix: "^tycho-" +separator: "." +git_url: https://github.com/eclipse/tycho.git