diff -u -r -N net-mgmt/crmsh.orig/Makefile net-mgmt/crmsh/Makefile --- net-mgmt/crmsh.orig/Makefile 2021-03-29 14:02:48.956506000 +0900 +++ net-mgmt/crmsh/Makefile 2021-03-30 10:38:49.893377000 +0900 @@ -1,8 +1,8 @@ # Created by: David Shane Holden -# $FreeBSD: head/net-mgmt/crmsh/Makefile 548620 2020-09-14 15:15:41Z egypcio $ +# $FreeBSD$ PORTNAME= crmsh -PORTVERSION= 3.0.5 +PORTVERSION= 4.3.0 CATEGORIES= net-mgmt python MAINTAINER= egypcio@FreeBSD.org @@ -11,9 +11,6 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 - # Set the build/run depends on setuptools instead of adding distutils to USE_PYTHON # because the crmsh build uses autotools which then calls setup.py. BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} @@ -23,7 +20,7 @@ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} -USES= autoreconf gmake python:2.7 shebangfix +USES= autoreconf gmake python:3.6+ shebangfix USE_GITHUB= yes GH_ACCOUNT= ClusterLabs GNU_CONFIGURE= yes @@ -32,9 +29,9 @@ NO_ARCH= yes SHEBANG_FILES= bin/crm \ + hb_report/hb_report.in \ scripts/*/*.py \ test/cib-tests.sh \ - test/docker_scripts.sh \ test/evaltest.sh \ test/list-undocumented-commands.py \ utils/crm_clean.py \ @@ -51,12 +48,11 @@ post-patch: @${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/setup.py + @${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/config.py @${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/corosync.py + @${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/crmsh/ui_analyze.py @${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/utils.py - @${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/hb_report.in - @${REINPLACE_CMD} 's,%%PYTHON_CMD%%,${PYTHON_CMD},g' ${WRKSRC}/hb_report/hb_report.in - @${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/openais_conf_support.sh - @${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/utillib.sh + @${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/utillib.py @${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/scripts/health/collect.py @${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/utils/crm_init.py diff -u -r -N net-mgmt/crmsh.orig/distinfo net-mgmt/crmsh/distinfo --- net-mgmt/crmsh.orig/distinfo 2021-03-29 14:02:48.957325000 +0900 +++ net-mgmt/crmsh/distinfo 2021-03-30 11:07:31.201444000 +0900 @@ -1,3 +1,3 @@ -TIMESTAMP = 1600084758 -SHA256 (ClusterLabs-crmsh-3.0.5_GH0.tar.gz) = 38c01ca0432e13874c42497e56980f922817dec1668866eefe9f2eb19a6b702a -SIZE (ClusterLabs-crmsh-3.0.5_GH0.tar.gz) = 979507 +TIMESTAMP = 1617001681 +SHA256 (ClusterLabs-crmsh-4.3.0_GH0.tar.gz) = 0053679a9006cf884acdfd63a2a02d0890ae31bef0dc03749756b23e737d2a09 +SIZE (ClusterLabs-crmsh-4.3.0_GH0.tar.gz) = 1090338 diff -u -r -N net-mgmt/crmsh.orig/files/patch-Makefile.am net-mgmt/crmsh/files/patch-Makefile.am --- net-mgmt/crmsh.orig/files/patch-Makefile.am 2021-03-29 14:02:48.957944000 +0900 +++ net-mgmt/crmsh/files/patch-Makefile.am 2021-03-30 10:08:44.940060000 +0900 @@ -1,6 +1,6 @@ ---- Makefile.am.orig 2017-01-31 14:52:10 UTC -+++ Makefile.am -@@ -51,7 +51,8 @@ endif +--- Makefile.am.orig 2021-02-19 01:48:25 UTC ++++ Makefile.am 2021-03-30 +@@ -51,7 +51,8 @@ install-data-hook: mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@/; \ for d in $$(cat data-manifest); do \ @@ -10,7 +10,7 @@ mv $(DESTDIR)$(datadir)/@PACKAGE@/test $(DESTDIR)$(datadir)/@PACKAGE@/tests; \ cp test/testcases/xmlonly.sh $(DESTDIR)$(datadir)/@PACKAGE@/tests/testcases/configbasic-xml.filter -@@ -66,7 +67,7 @@ all-local: +@@ -69,7 +70,7 @@ --build-base $(shell readlink -f $(builddir))/build \ --verbose) @@ -18,4 +18,4 @@ +python_prefix = --prefix=$(prefix) --root=$(DESTDIR) install-exec-local: - -mkdir -p $(DESTDIR)$(pkgpythondir) + $(INSTALL) -d -m 770 $(DESTDIR)/${localstatedir}/log/crmsh diff -u -r -N net-mgmt/crmsh.orig/files/patch-crmsh_config.py net-mgmt/crmsh/files/patch-crmsh_config.py --- net-mgmt/crmsh.orig/files/patch-crmsh_config.py 1970-01-01 09:00:00.000000000 +0900 +++ net-mgmt/crmsh/files/patch-crmsh_config.py 2021-03-30 10:10:40.940305000 +0900 @@ -0,0 +1,11 @@ +--- crmsh/config.py.orig 2021-02-19 01:48:25 UTC ++++ crmsh/config.py +@@ -40,7 +40,7 @@ + return dirs + + +-_SYSTEMWIDE = '/etc/crm/crm.conf' ++_SYSTEMWIDE = '%%PREFIX%%/etc/crm/crm.conf' + _PERUSER = os.getenv("CRM_CONFIG_FILE") or os.path.join(userdir.CONFIG_HOME, 'crm.conf') + + _PATHLIST = { diff -u -r -N net-mgmt/crmsh.orig/files/patch-crmsh_corosync.py net-mgmt/crmsh/files/patch-crmsh_corosync.py --- net-mgmt/crmsh.orig/files/patch-crmsh_corosync.py 2021-03-29 14:02:48.958568000 +0900 +++ net-mgmt/crmsh/files/patch-crmsh_corosync.py 2021-03-30 10:11:27.005741000 +0900 @@ -1,6 +1,6 @@ ---- crmsh/corosync.py.orig 2018-04-19 03:47:12 UTC +--- crmsh/corosync.py.orig 2021-02-19 01:48:25 UTC +++ crmsh/corosync.py -@@ -14,7 +14,7 @@ from .msg import err_buf, common_debug +@@ -16,7 +16,7 @@ def conf(): diff -u -r -N net-mgmt/crmsh.orig/files/patch-crmsh_ui__analyze.py net-mgmt/crmsh/files/patch-crmsh_ui__analyze.py --- net-mgmt/crmsh.orig/files/patch-crmsh_ui__analyze.py 1970-01-01 09:00:00.000000000 +0900 +++ net-mgmt/crmsh/files/patch-crmsh_ui__analyze.py 2021-03-30 10:07:19.787644000 +0900 @@ -0,0 +1,11 @@ +--- crmsh/ui_analyze.py.orig 2021-02-19 01:48:25 UTC ++++ crmsh/ui_analyze.py +@@ -6,7 +6,7 @@ + + from . import command + from . import utils +-sys.path.append("/usr/share/crmsh") ++sys.path.append("%%DATADIR%%") + from preflight_check import main + + diff -u -r -N net-mgmt/crmsh.orig/files/patch-crmsh_utils.py net-mgmt/crmsh/files/patch-crmsh_utils.py --- net-mgmt/crmsh.orig/files/patch-crmsh_utils.py 2021-03-29 14:02:48.959199000 +0900 +++ net-mgmt/crmsh/files/patch-crmsh_utils.py 2021-03-30 10:12:07.757133000 +0900 @@ -1,6 +1,6 @@ ---- crmsh/utils.py.orig 2018-04-19 03:54:07 UTC +--- crmsh/utils.py.orig 2021-02-19 01:48:25 UTC +++ crmsh/utils.py -@@ -989,7 +989,7 @@ def cluster_stack(): +@@ -1100,7 +1100,7 @@ return "heartbeat" elif is_process("[a]isexec"): return "openais" @@ -9,7 +9,7 @@ return "corosync" return "" -@@ -1551,7 +1551,7 @@ def list_corosync_node_names(): +@@ -1663,7 +1663,7 @@ in corosync.conf ''' try: @@ -18,7 +18,7 @@ lines = open(cfg).read().split('\n') name_re = re.compile(r'\s*name:\s+(.*)') names = [] -@@ -1570,7 +1570,7 @@ def list_corosync_nodes(): +@@ -1682,7 +1682,7 @@ in corosync.conf ''' try: diff -u -r -N net-mgmt/crmsh.orig/files/patch-hb__report_hb__report.in net-mgmt/crmsh/files/patch-hb__report_hb__report.in --- net-mgmt/crmsh.orig/files/patch-hb__report_hb__report.in 2021-03-29 14:02:48.959821000 +0900 +++ net-mgmt/crmsh/files/patch-hb__report_hb__report.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,52 +0,0 @@ ---- hb_report/hb_report.in.orig 2017-07-21 09:17:13 UTC -+++ hb_report/hb_report.in -@@ -203,11 +203,11 @@ time2str() { - } - # try to figure out where pacemaker ... etc - get_pe_state_dir() { -- PE_STATE_DIR=`python -c "import crmsh.config; print crmsh.config.path.pe_state_dir"` -+ PE_STATE_DIR=`%%PYTHON_CMD%% -c "import crmsh.config; print(crmsh.config.path.pe_state_dir)"` - test -d "$PE_STATE_DIR" - } - get_cib_dir() { -- CIB_DIR=`python -c "import crmsh.config; print crmsh.config.path.crm_config"` -+ CIB_DIR=`%%PYTHON_CMD%% -c "import crmsh.config; print(crmsh.config.path.crm_config)"` - test -d "$CIB_DIR" - } - get_pe_state_dir2() { -@@ -357,7 +357,7 @@ is_our_log() { - local cat - cat=`find_decompressor $logf` - local first_time="`$cat $logf | head -10 | find_first_ts`" -- local last_time="`$cat $logf | tail -10 | tac | find_first_ts`" -+ local last_time="`$cat $logf | tail -10 | tail -r | find_first_ts`" - if [ x = "x$first_time" -o x = "x$last_time" ]; then - return 0 # skip (empty log?) - fi -@@ -467,7 +467,7 @@ loginfo() { - local logf=$1 - local fake=$2 - local nextpos -- nextpos=`python -c "f=open('$logf');f.seek(0,2);print f.tell()+1"` -+ nextpos=`%%PYTHON_CMD%% -c "f=open('$logf');f.seek(0,2);print f.tell()+1"` - if [ "$fake" ]; then - echo "synthetic:$logf $nextpos" - else -@@ -1206,7 +1206,7 @@ which which >/dev/null 2>&1 || - fatal "please install the which(1) program" - - WE=`uname -n` # who am i? --tmpdir=`mktemp -t -d .hb_report.workdir.XXXXXX` || -+tmpdir=`mktemp -d` || - fatal "disk full" - add_tmpfiles $tmpdir - WORKDIR=$tmpdir -@@ -1322,7 +1322,7 @@ glibc - " - case "$CLUSTER_TYPE" in - openais) -- CONF=/etc/corosync/corosync.conf # corosync? -+ CONF=%%PREFIX%%/etc/corosync/corosync.conf # corosync? - if test -f $CONF; then - CORES_DIRS="$CORES_DIRS /var/lib/corosync" - else diff -u -r -N net-mgmt/crmsh.orig/files/patch-hb__report_openais__conf__support.sh net-mgmt/crmsh/files/patch-hb__report_openais__conf__support.sh --- net-mgmt/crmsh.orig/files/patch-hb__report_openais__conf__support.sh 2021-03-29 14:02:48.960444000 +0900 +++ net-mgmt/crmsh/files/patch-hb__report_openais__conf__support.sh 1970-01-01 09:00:00.000000000 +0900 @@ -1,13 +0,0 @@ ---- hb_report/openais_conf_support.sh.orig 2018-04-19 04:02:39 UTC -+++ hb_report/openais_conf_support.sh -@@ -70,8 +70,8 @@ getlogvars() { - } - cluster_info() { - : echo "openais version: how?" -- if [ "$CONF" = /etc/corosync/corosync.conf ]; then -- /usr/sbin/corosync -v -+ if [ "$CONF" = %%PREFIX%%/etc/corosync/corosync.conf ]; then -+ %%PREFIX%%/sbin/corosync -v - fi - } - essential_files() { diff -u -r -N net-mgmt/crmsh.orig/files/patch-hb__report_utillib.py net-mgmt/crmsh/files/patch-hb__report_utillib.py --- net-mgmt/crmsh.orig/files/patch-hb__report_utillib.py 1970-01-01 09:00:00.000000000 +0900 +++ net-mgmt/crmsh/files/patch-hb__report_utillib.py 2021-03-30 10:13:58.124719000 +0900 @@ -0,0 +1,11 @@ +--- hb_report/utillib.py.orig 2021-02-19 01:48:25 UTC ++++ hb_report/utillib.py +@@ -378,7 +378,7 @@ + constants.PCMK_LIB = os.path.dirname(constants.CIB_DIR) + log_debug("setting PCMK_LIB to %s" % constants.PCMK_LIB) + constants.CORES_DIRS = os.path.join(constants.PCMK_LIB, "cores") +- constants.CONF = "/etc/corosync/corosync.conf" ++ constants.CONF = "%%PREFIX%%/etc/corosync/corosync.conf" + if os.path.isfile(constants.CONF): + constants.CORES_DIRS += " /var/lib/corosync" + constants.B_CONF = os.path.basename(constants.CONF) diff -u -r -N net-mgmt/crmsh.orig/files/patch-hb__report_utillib.sh net-mgmt/crmsh/files/patch-hb__report_utillib.sh --- net-mgmt/crmsh.orig/files/patch-hb__report_utillib.sh 2021-03-29 14:02:48.961065000 +0900 +++ net-mgmt/crmsh/files/patch-hb__report_utillib.sh 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ ---- hb_report/utillib.sh.orig 2017-07-21 09:17:13 UTC -+++ hb_report/utillib.sh -@@ -8,7 +8,7 @@ - get_cluster_type() { - if ps -ef | egrep -qs '[a]isexec|[c]orosync' || - [ -f /etc/ais/openais.conf -a ! -f "$HA_CF" ] || -- [ -f /etc/corosync/corosync.conf -a ! -f "$HA_CF" ] -+ [ -f %%PREFIX%%/etc/corosync/corosync.conf -a ! -f "$HA_CF" ] - then - debug "this is OpenAIS cluster stack" - echo "openais" -@@ -525,7 +525,7 @@ crmconfig() { - CIB_file=$1/$CIB_F crm configure show >$1/$CIB_TXT_F 2>&1 - } - get_crm_nodes() { -- /usr/sbin/crm node server -+ %%PREFIX%%/bin/crm node server - } - get_live_nodes() { - if [ `id -u` = 0 ] && which fping >/dev/null 2>&1; then diff -u -r -N net-mgmt/crmsh.orig/files/patch-scripts_health_collect.py net-mgmt/crmsh/files/patch-scripts_health_collect.py --- net-mgmt/crmsh.orig/files/patch-scripts_health_collect.py 2021-03-29 14:02:48.961686000 +0900 +++ net-mgmt/crmsh/files/patch-scripts_health_collect.py 2021-03-30 10:15:20.142114000 +0900 @@ -1,6 +1,6 @@ ---- scripts/health/collect.py.orig 2018-04-19 04:04:24 UTC +--- scripts/health/collect.py.orig 2021-02-19 01:48:25 UTC +++ scripts/health/collect.py -@@ -67,7 +67,7 @@ def disk_info(): +@@ -75,7 +75,7 @@ FILES = [ '/etc/csync2/key_hagroup', '/etc/csync2/csync2.cfg', diff -u -r -N net-mgmt/crmsh.orig/files/patch-setup.py net-mgmt/crmsh/files/patch-setup.py --- net-mgmt/crmsh.orig/files/patch-setup.py 2021-03-29 14:02:48.962322000 +0900 +++ net-mgmt/crmsh/files/patch-setup.py 2021-03-30 10:17:49.166941000 +0900 @@ -1,8 +1,8 @@ ---- setup.py.orig 2017-05-19 19:22:47 UTC +--- setup.py.orig 2021-02-19 01:48:25 UTC +++ setup.py -@@ -12,5 +12,5 @@ setup(name='crmsh', +@@ -12,5 +12,5 @@ packages=['crmsh'], - install_requires=['parallax', 'lxml', 'PyYAML', 'python-dateutil'], + install_requires=['parallax', 'lxml', 'PyYAML', 'py-dateutil'], scripts=['bin/crm'], - data_files=[('/usr/share/crmsh', ['doc/crm.8.adoc'])], + data_files=[('%%DATADIR%%', ['doc/crm.8.adoc'])], diff -u -r -N net-mgmt/crmsh.orig/files/patch-utils_crm__init.py net-mgmt/crmsh/files/patch-utils_crm__init.py --- net-mgmt/crmsh.orig/files/patch-utils_crm__init.py 2021-03-29 14:02:48.962943000 +0900 +++ net-mgmt/crmsh/files/patch-utils_crm__init.py 2021-03-30 10:18:39.022941000 +0900 @@ -1,6 +1,6 @@ ---- utils/crm_init.py.orig 2018-04-19 04:05:44 UTC +--- utils/crm_init.py.orig 2021-02-19 01:48:25 UTC +++ utils/crm_init.py -@@ -13,7 +13,7 @@ SERVICES = ['sshd', 'ntp', 'corosync', ' +@@ -13,7 +13,7 @@ SSH_KEY = os.path.expanduser('~/.ssh/id_rsa') CSYNC2_KEY = '/etc/csync2/key_hagroup' CSYNC2_CFG = '/etc/csync2/csync2.cfg' @@ -9,7 +9,7 @@ SYSCONFIG_SBD = '/etc/sysconfig/sbd' SYSCONFIG_FW = '/etc/sysconfig/SuSEfirewall2' SYSCONFIG_FW_CLUSTER = '/etc/sysconfig/SuSEfirewall2.d/services/cluster' -@@ -107,7 +107,7 @@ def files_info(): +@@ -92,7 +92,7 @@ def logrotate_info(): rc, _, _ = crm_script.call( diff -u -r -N net-mgmt/crmsh.orig/pkg-plist net-mgmt/crmsh/pkg-plist --- net-mgmt/crmsh.orig/pkg-plist 2021-03-29 14:02:48.967893000 +0900 +++ net-mgmt/crmsh/pkg-plist 2021-03-29 16:43:42.931262000 +0900 @@ -1,138 +1,150 @@ @sample etc/crm/crm.conf.sample -%%PYTHON_SITELIBDIR%%/crmsh-3.0.1-py%%PYTHON_VER%%.egg-info/PKG-INFO -%%PYTHON_SITELIBDIR%%/crmsh-3.0.1-py%%PYTHON_VER%%.egg-info/SOURCES.txt -%%PYTHON_SITELIBDIR%%/crmsh-3.0.1-py%%PYTHON_VER%%.egg-info/dependency_links.txt -%%PYTHON_SITELIBDIR%%/crmsh-3.0.1-py%%PYTHON_VER%%.egg-info/requires.txt -%%PYTHON_SITELIBDIR%%/crmsh-3.0.1-py%%PYTHON_VER%%.egg-info/top_level.txt +%%PYTHON_SITELIBDIR%%/crmsh-4.2.0-py3.7.egg-info/PKG-INFO +%%PYTHON_SITELIBDIR%%/crmsh-4.2.0-py3.7.egg-info/SOURCES.txt +%%PYTHON_SITELIBDIR%%/crmsh-4.2.0-py3.7.egg-info/dependency_links.txt +%%PYTHON_SITELIBDIR%%/crmsh-4.2.0-py3.7.egg-info/requires.txt +%%PYTHON_SITELIBDIR%%/crmsh-4.2.0-py3.7.egg-info/top_level.txt %%PYTHON_SITELIBDIR%%/crmsh/__init__.py -%%PYTHON_SITELIBDIR%%/crmsh/__init__.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/__init__.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/bootstrap.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/cache.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/cibconfig.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/cibstatus.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/cibverify.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/clidisplay.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/cliformat.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/cmd_status.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/command.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/completers.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/config.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/constants.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/corosync.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/crm_gv.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/crm_pssh.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/handles.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/help.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/history.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/idmgmt.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/lock.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/log_patterns.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/logparser.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/logtime.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/main.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/minieval.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/msg.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/options.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ordereddict.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/orderedset.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/pacemaker.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/parallax.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/parse.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ra.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/rsctest.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/schema.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/scripts.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/template.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/term.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/tmpfiles.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_analyze.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_assist.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_cib.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_cibstatus.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_cluster.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_configure.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_context.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_corosync.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_history.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_maintenance.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_node.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_options.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_ra.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_report.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_resource.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_root.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_script.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_site.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_template.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_utils.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/userdir.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/utils.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/xmlutil.cpython-37.pyc %%PYTHON_SITELIBDIR%%/crmsh/bootstrap.py -%%PYTHON_SITELIBDIR%%/crmsh/bootstrap.pyc %%PYTHON_SITELIBDIR%%/crmsh/cache.py -%%PYTHON_SITELIBDIR%%/crmsh/cache.pyc %%PYTHON_SITELIBDIR%%/crmsh/cibconfig.py -%%PYTHON_SITELIBDIR%%/crmsh/cibconfig.pyc %%PYTHON_SITELIBDIR%%/crmsh/cibstatus.py -%%PYTHON_SITELIBDIR%%/crmsh/cibstatus.pyc %%PYTHON_SITELIBDIR%%/crmsh/cibverify.py -%%PYTHON_SITELIBDIR%%/crmsh/cibverify.pyc %%PYTHON_SITELIBDIR%%/crmsh/clidisplay.py -%%PYTHON_SITELIBDIR%%/crmsh/clidisplay.pyc %%PYTHON_SITELIBDIR%%/crmsh/cliformat.py -%%PYTHON_SITELIBDIR%%/crmsh/cliformat.pyc %%PYTHON_SITELIBDIR%%/crmsh/cmd_status.py -%%PYTHON_SITELIBDIR%%/crmsh/cmd_status.pyc %%PYTHON_SITELIBDIR%%/crmsh/command.py -%%PYTHON_SITELIBDIR%%/crmsh/command.pyc %%PYTHON_SITELIBDIR%%/crmsh/completers.py -%%PYTHON_SITELIBDIR%%/crmsh/completers.pyc %%PYTHON_SITELIBDIR%%/crmsh/config.py -%%PYTHON_SITELIBDIR%%/crmsh/config.pyc %%PYTHON_SITELIBDIR%%/crmsh/constants.py -%%PYTHON_SITELIBDIR%%/crmsh/constants.pyc %%PYTHON_SITELIBDIR%%/crmsh/corosync.py -%%PYTHON_SITELIBDIR%%/crmsh/corosync.pyc %%PYTHON_SITELIBDIR%%/crmsh/crm_gv.py -%%PYTHON_SITELIBDIR%%/crmsh/crm_gv.pyc %%PYTHON_SITELIBDIR%%/crmsh/crm_pssh.py -%%PYTHON_SITELIBDIR%%/crmsh/crm_pssh.pyc %%PYTHON_SITELIBDIR%%/crmsh/handles.py -%%PYTHON_SITELIBDIR%%/crmsh/handles.pyc %%PYTHON_SITELIBDIR%%/crmsh/help.py -%%PYTHON_SITELIBDIR%%/crmsh/help.pyc %%PYTHON_SITELIBDIR%%/crmsh/history.py -%%PYTHON_SITELIBDIR%%/crmsh/history.pyc %%PYTHON_SITELIBDIR%%/crmsh/idmgmt.py -%%PYTHON_SITELIBDIR%%/crmsh/idmgmt.pyc %%PYTHON_SITELIBDIR%%/crmsh/install_files.txt +%%PYTHON_SITELIBDIR%%/crmsh/lock.py %%PYTHON_SITELIBDIR%%/crmsh/log_patterns.py -%%PYTHON_SITELIBDIR%%/crmsh/log_patterns.pyc %%PYTHON_SITELIBDIR%%/crmsh/logparser.py -%%PYTHON_SITELIBDIR%%/crmsh/logparser.pyc %%PYTHON_SITELIBDIR%%/crmsh/logtime.py -%%PYTHON_SITELIBDIR%%/crmsh/logtime.pyc %%PYTHON_SITELIBDIR%%/crmsh/main.py -%%PYTHON_SITELIBDIR%%/crmsh/main.pyc +%%PYTHON_SITELIBDIR%%/crmsh/minieval.py %%PYTHON_SITELIBDIR%%/crmsh/msg.py -%%PYTHON_SITELIBDIR%%/crmsh/msg.pyc %%PYTHON_SITELIBDIR%%/crmsh/options.py -%%PYTHON_SITELIBDIR%%/crmsh/options.pyc %%PYTHON_SITELIBDIR%%/crmsh/ordereddict.py -%%PYTHON_SITELIBDIR%%/crmsh/ordereddict.pyc %%PYTHON_SITELIBDIR%%/crmsh/orderedset.py -%%PYTHON_SITELIBDIR%%/crmsh/orderedset.pyc %%PYTHON_SITELIBDIR%%/crmsh/pacemaker.py -%%PYTHON_SITELIBDIR%%/crmsh/pacemaker.pyc -%%PYTHON_SITELIBDIR%%/crmsh/parallax_helper.py -%%PYTHON_SITELIBDIR%%/crmsh/parallax_helper.pyc +%%PYTHON_SITELIBDIR%%/crmsh/parallax.py %%PYTHON_SITELIBDIR%%/crmsh/parse.py -%%PYTHON_SITELIBDIR%%/crmsh/parse.pyc %%PYTHON_SITELIBDIR%%/crmsh/ra.py -%%PYTHON_SITELIBDIR%%/crmsh/ra.pyc %%PYTHON_SITELIBDIR%%/crmsh/rsctest.py -%%PYTHON_SITELIBDIR%%/crmsh/rsctest.pyc %%PYTHON_SITELIBDIR%%/crmsh/schema.py -%%PYTHON_SITELIBDIR%%/crmsh/schema.pyc %%PYTHON_SITELIBDIR%%/crmsh/scripts.py -%%PYTHON_SITELIBDIR%%/crmsh/scripts.pyc %%PYTHON_SITELIBDIR%%/crmsh/template.py -%%PYTHON_SITELIBDIR%%/crmsh/template.pyc %%PYTHON_SITELIBDIR%%/crmsh/term.py -%%PYTHON_SITELIBDIR%%/crmsh/term.pyc %%PYTHON_SITELIBDIR%%/crmsh/tmpfiles.py -%%PYTHON_SITELIBDIR%%/crmsh/tmpfiles.pyc +%%PYTHON_SITELIBDIR%%/crmsh/ui_analyze.py %%PYTHON_SITELIBDIR%%/crmsh/ui_assist.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_assist.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_cib.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_cib.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_cibstatus.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_cibstatus.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_cluster.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_cluster.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_configure.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_configure.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_context.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_context.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_corosync.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_corosync.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_history.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_history.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_maintenance.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_maintenance.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_node.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_node.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_options.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_options.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_ra.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_ra.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_report.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_report.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_resource.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_resource.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_root.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_root.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_script.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_script.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_site.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_site.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_template.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_template.pyc %%PYTHON_SITELIBDIR%%/crmsh/ui_utils.py -%%PYTHON_SITELIBDIR%%/crmsh/ui_utils.pyc %%PYTHON_SITELIBDIR%%/crmsh/userdir.py -%%PYTHON_SITELIBDIR%%/crmsh/userdir.pyc %%PYTHON_SITELIBDIR%%/crmsh/utils.py -%%PYTHON_SITELIBDIR%%/crmsh/utils.pyc %%PYTHON_SITELIBDIR%%/crmsh/xmlutil.py -%%PYTHON_SITELIBDIR%%/crmsh/xmlutil.pyc %%MANPAGES%%man/man8/crm.8.gz %%MANPAGES%%man/man8/crmsh_hb_report.8.gz bin/crm %%DATADIR%%/crm.8.adoc -%%DATADIR%%/hb_report/ha_cf_support.sh +%%DATADIR%%/hb_report/constants.py %%DATADIR%%/hb_report/hb_report -%%DATADIR%%/hb_report/openais_conf_support.sh -%%DATADIR%%/hb_report/utillib.sh +%%DATADIR%%/hb_report/utillib.py +%%DATADIR%%/preflight_check/__init__.py +%%DATADIR%%/preflight_check/check.py +%%DATADIR%%/preflight_check/config.py +%%DATADIR%%/preflight_check/explain.py +%%DATADIR%%/preflight_check/main.py +%%DATADIR%%/preflight_check/task.py +%%DATADIR%%/preflight_check/utils.py %%DATADIR%%/scripts/apache/main.yml %%DATADIR%%/scripts/check-uptime/fetch.py %%DATADIR%%/scripts/check-uptime/main.yml @@ -154,11 +166,12 @@ %%DATADIR%%/scripts/health/main.yml %%DATADIR%%/scripts/health/report.py %%DATADIR%%/scripts/libvirt/main.yml -%%DATADIR%%/scripts/lvm/main.yml %%DATADIR%%/scripts/lvm-drbd/main.yml +%%DATADIR%%/scripts/lvm/main.yml %%DATADIR%%/scripts/mailto/main.yml -%%DATADIR%%/scripts/nfsserver/main.yml %%DATADIR%%/scripts/nfsserver-lvm-drbd/main.yml +%%DATADIR%%/scripts/nfsserver/main.yml +%%DATADIR%%/scripts/nginx/main.yml %%DATADIR%%/scripts/ocfs2/main.yml %%DATADIR%%/scripts/oracle/main.yml %%DATADIR%%/scripts/raid-lvm/main.yml @@ -170,8 +183,8 @@ %%DATADIR%%/scripts/sap-simple-stack/main.yml %%DATADIR%%/scripts/sapdb/main.yml %%DATADIR%%/scripts/sapinstance/main.yml -%%DATADIR%%/scripts/sbd/main.yml %%DATADIR%%/scripts/sbd-device/main.yml +%%DATADIR%%/scripts/sbd/main.yml %%DATADIR%%/scripts/virtual-ip/main.yml %%DATADIR%%/scripts/vmware/main.yml %%DATADIR%%/templates/apache @@ -204,8 +217,17 @@ %%DATADIR%%/tests/features/bootstrap_init_join_remove.feature %%DATADIR%%/tests/features/bootstrap_options.feature %%DATADIR%%/tests/features/bootstrap_sbd.feature +%%DATADIR%%/tests/features/configure_bugs.feature +%%DATADIR%%/tests/features/constraints_bugs.feature %%DATADIR%%/tests/features/environment.py %%DATADIR%%/tests/features/geo_setup.feature +%%DATADIR%%/tests/features/hb_report_bugs.feature +%%DATADIR%%/tests/features/qdevice_options.feature +%%DATADIR%%/tests/features/qdevice_setup_remove.feature +%%DATADIR%%/tests/features/qdevice_usercase.feature +%%DATADIR%%/tests/features/qdevice_validate.feature +%%DATADIR%%/tests/features/resource_failcount.feature +%%DATADIR%%/tests/features/resource_set.feature %%DATADIR%%/tests/features/steps/__init__.py %%DATADIR%%/tests/features/steps/const.py %%DATADIR%%/tests/features/steps/step_implenment.py @@ -223,6 +245,8 @@ %%DATADIR%%/tests/testcases/basicset %%DATADIR%%/tests/testcases/bugs %%DATADIR%%/tests/testcases/bugs.exp +%%DATADIR%%/tests/testcases/bundle +%%DATADIR%%/tests/testcases/bundle.exp %%DATADIR%%/tests/testcases/commit %%DATADIR%%/tests/testcases/commit.exp %%DATADIR%%/tests/testcases/common.excl @@ -231,7 +255,7 @@ %%DATADIR%%/tests/testcases/confbasic-xml %%DATADIR%%/tests/testcases/confbasic-xml.exp %%DATADIR%%/tests/testcases/confbasic.exp -%%DATADIR%%/tests/testcases/confbasic-xml.filter +%%DATADIR%%/tests/testcases/configbasic-xml.filter %%DATADIR%%/tests/testcases/delete %%DATADIR%%/tests/testcases/delete.exp %%DATADIR%%/tests/testcases/edit @@ -258,7 +282,6 @@ %%DATADIR%%/tests/testcases/rset %%DATADIR%%/tests/testcases/rset-xml %%DATADIR%%/tests/testcases/rset-xml.exp -%%DATADIR%%/tests/testcases/rset-xml.filter %%DATADIR%%/tests/testcases/rset.exp %%DATADIR%%/tests/testcases/scripts %%DATADIR%%/tests/testcases/scripts.exp @@ -267,10 +290,14 @@ %%DATADIR%%/tests/testcases/shadow.exp %%DATADIR%%/tests/testcases/xmlonly.sh %%DATADIR%%/tests/travis-tests.sh +%%DATADIR%%/tests/unit-tests-in-container.sh %%DATADIR%%/tests/unittests/__init__.py %%DATADIR%%/tests/unittests/bug-862577_corosync.conf %%DATADIR%%/tests/unittests/corosync.conf.1 %%DATADIR%%/tests/unittests/corosync.conf.2 +%%DATADIR%%/tests/unittests/corosync.conf.3 +%%DATADIR%%/tests/unittests/pacemaker.log +%%DATADIR%%/tests/unittests/pacemaker_unicode.log %%DATADIR%%/tests/unittests/schemas/acls-1.1.rng %%DATADIR%%/tests/unittests/schemas/acls-1.2.rng %%DATADIR%%/tests/unittests/schemas/constraints-1.0.rng @@ -305,13 +332,20 @@ %%DATADIR%%/tests/unittests/test_corosync.py %%DATADIR%%/tests/unittests/test_gv.py %%DATADIR%%/tests/unittests/test_handles.py +%%DATADIR%%/tests/unittests/test_lock.py %%DATADIR%%/tests/unittests/test_objset.py %%DATADIR%%/tests/unittests/test_parallax.py %%DATADIR%%/tests/unittests/test_parse.py -%%DATADIR%%/tests/unittests/test_resource.py +%%DATADIR%%/tests/unittests/test_preflight_check.py +%%DATADIR%%/tests/unittests/test_preflight_main.py +%%DATADIR%%/tests/unittests/test_preflight_task.py +%%DATADIR%%/tests/unittests/test_preflight_utils.py +%%DATADIR%%/tests/unittests/test_report.py %%DATADIR%%/tests/unittests/test_scripts.py %%DATADIR%%/tests/unittests/test_time.py +%%DATADIR%%/tests/unittests/test_ui_cluster.py %%DATADIR%%/tests/unittests/test_utils.py +%%DATADIR%%/tests/update-expected-output.sh %%DATADIR%%/utils/crm_clean.py %%DATADIR%%/utils/crm_init.py %%DATADIR%%/utils/crm_pkg.py