diff options
| -rw-r--r-- | README.rst (renamed from README) | 2 | ||||
| -rw-r--r-- | misc/bcfg2.spec | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Reporting/Storage/DjangoORM.py | 1 | ||||
| -rwxr-xr-x | testsuite/install.sh | 3 |
4 files changed, 4 insertions, 4 deletions
@@ -1,5 +1,5 @@ Bcfg2 - A Configuration Management System ------------------------------------------ +========================================= Bcfg2 (bee-config two) helps system administrators produce a consistent, reproducible, and verifiable description of their diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 91260c317..443e0d27a 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -667,7 +667,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ # Required for EL5 and OpenSUSE %defattr(-,root,root,-) %endif -%doc COPYRIGHT LICENSE README +%doc COPYRIGHT LICENSE README.rst %{_mandir}/man1/bcfg2.1* %{_mandir}/man5/bcfg2.conf.5* %ghost %attr(600,root,root) %config(noreplace,missingok) %{_sysconfdir}/bcfg2.cert diff --git a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py index 347e5cc81..e7b23e572 100644 --- a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py +++ b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py @@ -7,6 +7,7 @@ import traceback from datetime import datetime from time import strptime from lxml import etree +import sys import django from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned diff --git a/testsuite/install.sh b/testsuite/install.sh index 1a9f0dcfc..4d8778ad7 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -17,8 +17,7 @@ if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then sudo apt-get install -y yum libaugeas0 augeas-lenses libacl1-dev libssl-dev \ python-gamin python-selinux - pip install PyYAML pyinotify boto pylibacl Jinja2 mercurial guppy cherrypy - easy_install https://fedorahosted.org/released/python-augeas/python-augeas-0.4.1.tar.gz + pip install PyYAML pyinotify boto pylibacl Jinja2 mercurial guppy cherrypy python-augeas if [[ ${PYVER:0:1} == "2" ]]; then pip install cheetah m2crypto |