Skip to content

Commit e893b7d

Browse files
Merge pull request #25 from mwestphall/SOFTWARE-5131-perl-dependency
SOFTWARE-5131 perl dependency
2 parents ce21a5b + f87fd8c commit e893b7d

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

rpm/hosted-ce-tools.spec

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
Summary: Tools for managing OSG Hosted CEs
33
Name: hosted-ce-tools
44
Version: 1.0
5-
Release: 3%{?dist}
5+
Release: 4%{?dist}
66
License: Apache 2.0
77
Url: https://github.com/opensciencegrid/hosted-ce-tools
88
Source0: %{name}-%{version}.tar.gz
99
BuildArch: noarch
1010
Requires: fetch-crl
1111
Requires: sudo
1212
Requires: wget
13+
Requires: rsync
14+
Requires: perl
1315
Requires: /usr/bin/git
1416
%systemd_requires
1517

@@ -51,6 +53,9 @@ systemctl daemon-reload
5153

5254

5355
%changelog
56+
* Thu Jun 08 2023 Matt Westphall <[email protected]> - 1.0-4
57+
- Add missing dependencies on perl and rsync to spec file (SOFTWARE-5131)
58+
5459
* Fri Jun 02 2023 Matt Westphall <[email protected]> - 1.0-3
5560
- Remove dependency on python-six (SOFTWARE-5131)
5661

scripts/update-all-remote-wn-clients

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def main():
174174
)
175175
opts, _ = parser.parse_args()
176176

177-
cfg = configparser.SafeConfigParser()
177+
cfg = configparser.ConfigParser()
178178
cfg.read(opts.config)
179179

180180
sections_list = list(x for x in cfg.sections() if x.startswith("Endpoint"))

scripts/update-remote-wn-client

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def update_crls(cert_dir):
101101
proc = Popen(command, stdout=PIPE, stderr=STDOUT)
102102
output, _ = proc.communicate()
103103
if proc.returncode != 0:
104-
if output and ("CRL verification failed" in output or "Download error" in output):
104+
if output and (b"CRL verification failed" in output or b"Download error" in output):
105105
# These errors aren't actually fatal; we'll send a less alarming
106106
# notification about them.
107107
log.info(output)

0 commit comments

Comments
 (0)