Commit 1872a286 authored by Manuela Kuhn's avatar Manuela Kuhn

Merge branch 'release-3.1.1'

parents 764539fb 66cb35aa
[bumpversion]
current_version = 3.1.0
current_version = 3.1.1
tag = False
commit = False
files = freeze_setup.py src/APIs/hidra/_version.py src/shared/_version.py
......
[bumpversion]
current_version = 3.1.0
current_version = 3.1.1
tag = False
commit = False
......
HiDRA develop
HiDRA 3.1.1
HiDRA 3.1.0
- Adjusted host names in mapping for control API
......
......@@ -125,7 +125,7 @@ executables = [
]
setup(name='HiDRA',
version='3.1.0',
version='3.1.1',
description='',
options={"build_exe": build_exe_options,
"bdist_msi": bdist_msi_options},
......
Name: hidra
Version: 3.1.0
Version: 3.1.1
Release: 1%{?dist}
Summary: High performance data multiplexing tool
......@@ -100,7 +100,9 @@ mkdir -p %{buildroot}/var/log/%{name}
/opt/%{name}/src/sender/*
%attr(0755,root,root) /opt/%{name}/src/sender/datamanager.py
/opt/%{name}/src/shared/*
/opt/%{name}/src/hidra_control/*
/opt/%{name}/src/hidra_control/hidra_control_server.py
/opt/%{name}/src/hidra_control/hidra_control_server.pyc
/opt/%{name}/src/hidra_control/hidra_control_server.pyo
%{_unitdir}/*.service
%config(noreplace) /opt/%{name}/conf/*
%attr(1777,root,root) /var/log/%{name}
......@@ -110,8 +112,12 @@ mkdir -p %{buildroot}/var/log/%{name}
%files -n hidra-control-client
/opt/%{name}/src/hidra_control/hidra_control_client.py
/opt/%{name}/src/hidra_control/hidra_control_client.pyc
/opt/%{name}/src/hidra_control/hidra_control_client.pyo
%changelog
* Wed Apr 19 2017 Manuela Kuhn <manuela.kuhn@desy.de> - 3.1.1-1
- Bump version
* Wed Apr 19 2017 Manuela Kuhn <manuela.kuhn@desy.de> - 3.1.0-1
- Bump version
* Tue Apr 18 2017 Manuela Kuhn <manuela.kuhn@desy.de> - 3.0.2-4
......
__version__ = b'3.1.0'
__version__ = b'3.1.1'
......@@ -538,7 +538,7 @@ def call_hidra_service(cmd, beamline, det_id, log):
if cmd == "status":
return subprocess.call(["systemctl", "is-active", svc])
else:
return subprocess.call(["sudo", "systemctl", cmd, svc])
return subprocess.call(["sudo", "-n", "systemctl", cmd, svc])
# systems using init scripts
elif os.path.exists("/etc/init.d") \
......
__version__ = '3.1.0'
__version__ = '3.1.1'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment