From 5a888a1323e6d8d7755cf4a700788a06cdcea9d1 Mon Sep 17 00:00:00 2001 From: Miro HronĨok Date: Feb 26 2020 08:45:30 +0000 Subject: Critpath adjustments to at least make it run Signed-off-by: Critical Path --- diff --git a/scripts/critpath.py b/scripts/critpath.py index dfba832..4cd57b1 100755 --- a/scripts/critpath.py +++ b/scripts/critpath.py @@ -27,10 +27,10 @@ critpath_groups = [ '@critical-path-gnome', '@critical-path-kde', '@critical-path-lxde', '@critical-path-xfce' ] -primary_arches=('armhfp', 'x86_64') -alternate_arches=('i386','aarch64','ppc64','ppc64le','s390x') +primary_arches=('armhfp', 'aarch64', 'x86_64') +alternate_arches=('ppc64le','s390x') # There is not current a programmatic way to generate this list -fakearch = {'i386':'i686', 'x86_64':'x86_64', 'ppc64':'ppc64', 'ppc':'ppc64', 'armhfp':'armv7hl', 'aarch64':'aarch64', 'ppc64le':'ppc64', 's390x':'s390x'} +fakearch = {'i386':'i686', 'x86_64':'x86_64', 'ppc64':'ppc64', 'ppc':'ppc64', 'armhfp':'armv7hl', 'aarch64':'aarch64', 'ppc64le':'ppc64le', 's390x':'s390x'} fedora_baseurl = 'http://dl.fedoraproject.org/pub/fedora/linux/' fedora_alternateurl = 'http://dl.fedoraproject.org/pub/fedora-secondary/' releasepath = { @@ -42,13 +42,13 @@ updatepath = { 'rawhide': '' } -for x in range(12,27,1): +for x in range(12,32,1): r = str(x) releasepath[r] = 'releases/%s/Everything/$basearch/os/' % r updatepath[r] = 'updates/%s/$basearch/' % r # Branched Fedora goes here -branched = '28' +branched = '31' releasepath['branched'] = 'development/%s/Everything/$basearch/os' % branched updatepath['branched'] = '' diff --git a/scripts/get-critpath b/scripts/get-critpath index fc6c6f0..eb1557c 100755 --- a/scripts/get-critpath +++ b/scripts/get-critpath @@ -26,13 +26,13 @@ def main(): parser = setup_args() args = parser.parse_args() - pdc = pdc_client.PDCClient('fedora') + pdc = pdc_client.PDCClient('fedora', develop=True) endpoint = pdc['component-branches'] kwargs = dict(name=args.branch, active=True) existing = pdc.get_paged(endpoint, **kwargs) try: - existing.next() + next(existing) except StopIteration: print("%s not a valid branch." % args.branch, file=sys.stderr) sys.exit(1)