From b147d864468614dd3e2e64304c71847c069f293b Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 10 May 2024 13:17:16 +0200 Subject: [PATCH] only change view name from all to All when All was requested Otherwise you get errors like: Traceback (most recent call last): File "path/bin/jenkins-jobs", line 8, in sys.exit(main()) ^^^^^^ File "path/lib64/python3.12/site-packages/jenkins_jobs/cli/entry.py", line 179, in main jjb.execute() File "path/lib64/python3.12/site-packages/jenkins_jobs/cli/entry.py", line 158, in execute ext.obj.execute(self.options, self.jjb_config) File "path/lib64/python3.12/site-packages/jenkins_jobs/cli/subcommand/update.py", line 154, in execute n = builder.delete_old_managed_views(keep=keep_views) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "path/lib64/python3.12/site-packages/jenkins_jobs/builder.py", line 402, in delete_old_managed_views if view["name"] not in keep and self.is_view(view["name"], use_cache=False): ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "path/lib64/python3.12/site-packages/jenkins_jobs/builder.py", line 384, in is_view return self.jenkins.view_exists(view_name) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "path/lib64/python3.12/site-packages/jenkins/__init__.py", line 1857, in view_exists if self.get_view_name(name) == name: ^^^^^^^^^^^^^^^^^^^^^^^^ File "path/lib64/python3.12/site-packages/jenkins/__init__.py", line 1834, in get_view_name raise JenkinsException( jenkins.JenkinsException: Jenkins returned an unexpected view name All (expected: all) Fixes: a8f0d8cfda832c700cf4ca744d07acff3afc5f04 Change-Id: I82b5abd8429190e871e432732d502b0640ebc99b Signed-off-by: Evgeni Golov --- jenkins/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/__init__.py b/jenkins/__init__.py index ed1e5ca..009f4da 100755 --- a/jenkins/__init__.py +++ b/jenkins/__init__.py @@ -1827,7 +1827,7 @@ class Jenkins(object): return None else: actual = json.loads(response)['name'] - if actual == 'all': + if actual == 'all' and short_name == 'All': actual = 'All' if actual != short_name: raise JenkinsException(