rpms/bcfg2/EL-5 bcfg2-0.9.5pre4-tgenshi.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 bcfg2.spec, 1.9, 1.10 sources, 1.5, 1.6
Jeffrey C. Ollie (jcollie)
fedora-extras-commits at redhat.com
Mon Nov 12 13:58:09 UTC 2007
- Previous message (by thread): rpms/roundcubemail/F-7 roundcubemail.spec,1.3,1.4 sources,1.3,1.4
- Next message (by thread): rpms/bcfg2/F-7 bcfg2-0.9.5pre4-tgenshi.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 bcfg2.spec, 1.11, 1.12 sources, 1.5, 1.6 0001-Fix-name-issue-caused-YUMng-failure.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jcollie
Update of /cvs/pkgs/rpms/bcfg2/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32253
Modified Files:
.cvsignore bcfg2.spec sources
Added Files:
bcfg2-0.9.5pre4-tgenshi.patch
Log Message:
Update to 0.9.5 final
bcfg2-0.9.5pre4-tgenshi.patch:
--- NEW FILE bcfg2-0.9.5pre4-tgenshi.patch ---
diff --git a/src/lib/Server/Plugins/TGenshi.py b/src/lib/Server/Plugins/TGenshi.py
index 5867797..7855763 100644
--- a/src/lib/Server/Plugins/TGenshi.py
+++ b/src/lib/Server/Plugins/TGenshi.py
@@ -1,6 +1,8 @@
'''This module implements a templating generator based on Genshi'''
__revision__ = '$Revision$'
+import os
+
from genshi.template import TemplateLoader, TextTemplate, MarkupTemplate, TemplateError
import logging, lxml.etree, posixpath, re, os
import Bcfg2.Server.Plugin
@@ -18,23 +20,25 @@ class TemplateFile:
self.properties = properties
self.loader = loader
- def HandleEvent(self, event):
+ def HandleEvent(self, data, event):
'''Handle all fs events for this template'''
if event.filename in ['template.xml', 'template.txt']:
try:
+ fpath = os.path.join(self.name[1:], event.filename)
if event.filename.endswith('.txt'):
- self.template = self.loader.load(os.path.join(self.name[1:], event.filename), cls=TextTemplate)
+ self.template = self.loader.load(fpath, cls=TextTemplate)
else:
- self.template = self.loader.load(os.path.join(self.name[1:], event.filename), cls=MarkupTemplate)
+ self.template = self.loader.load(fpath, cls=MarkupTemplate)
except TemplateError, terror:
logger.error('Genshi template error: %s' % terror)
elif event.filename == 'info.xml':
if not hasattr(self, 'infoxml'):
- fpath = self.name + '/info.xml'
+ fpath = os.path.join(os.path.join(data, self.name[1:]), 'info.xml')
self.infoxml = Bcfg2.Server.Plugin.XMLSrc(fpath, True)
self.infoxml.HandleEvent(event)
elif event.filename == 'info':
- for line in open(self.name + '/info').readlines():
+ fpath = os.path.join(os.path.join(data, self.name[1:]), 'info')
+ for line in open(fpath).readlines():
match = info.match(line)
if not match:
logger.warning("Failed to match line: %s"%line)
@@ -134,12 +138,12 @@ class TGenshi(Bcfg2.Server.Plugin.Plugin):
if not self.entries.has_key(identifier):
self.entries[identifier] = TemplateFile(identifier, self.loader, self.properties)
self.Entries['ConfigFile'][identifier] = self.BuildEntry
- self.entries[identifier].HandleEvent(event)
+ self.entries[identifier].HandleEvent(self.data, event)
else:
logger.info('Not creating template for %s' % identifier)
elif action == 'changed':
if self.entries.has_key(identifier):
- self.entries[identifier].HandleEvent(event)
+ self.entries[identifier].HandleEvent(self.data, event)
elif action == 'deleted':
if event.filename in ['template.xml', 'template.txt'] and self.entries.has_key(identifier):
del self.entries[identifier]
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bcfg2/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 26 Jun 2007 03:01:28 -0000 1.5
+++ .cvsignore 12 Nov 2007 13:57:36 -0000 1.6
@@ -1 +1 @@
-bcfg2-0.9.4.tar.gz
+bcfg2-0.9.5.tar.gz
Index: bcfg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bcfg2/EL-5/bcfg2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bcfg2.spec 26 Jun 2007 03:01:28 -0000 1.9
+++ bcfg2.spec 12 Nov 2007 13:57:36 -0000 1.10
@@ -1,18 +1,18 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-#define pre 4
-
Name: bcfg2
-Version: 0.9.4
-Release: 2%{?pre:.pre%{pre}}%{?dist}
+Version: 0.9.5
+Release: 2%{?dist}
Summary: Configuration management system
Group: Applications/System
License: BSD
URL: http://trac.mcs.anl.gov/projects/bcfg2
-Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?pre:pre%{pre}}.tar.gz
+Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}.tar.gz
Patch0: bcfg2-serverinitsubsys.patch
+Patch1: bcfg2-0.9.5pre4-tgenshi.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -58,6 +58,8 @@
Requires: /usr/bin/openssl
Requires: gamin-python
Requires: redhat-lsb
+Requires: python-genshi
+Requires: python-cheetah
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
@@ -67,8 +69,9 @@
Configuration management server
%prep
-%setup -q -n bcfg2-%{version}%{?pre:pre%{pre}}
+%setup -q
%patch0 -p0 -b .serverinitsubsys
+%patch1 -p1
# fixup some paths
%{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig at g' debian/buildsys/common/bcfg2.init
@@ -162,6 +165,7 @@
%dir %{python_sitelib}/Bcfg2
%{python_sitelib}/Bcfg2/__init__.*
%{python_sitelib}/Bcfg2/Client
+%{python_sitelib}/Bcfg2/Component.*
%{python_sitelib}/Bcfg2/Logging.*
%{python_sitelib}/Bcfg2/Options.*
%{python_sitelib}/Bcfg2/tlslite
@@ -191,17 +195,38 @@
%{_sbindir}/bcfg2-ping-sweep
%{_sbindir}/bcfg2-query
%{_sbindir}/bcfg2-repo-validate
+%{_sbindir}/bcfg2-remote
%{_sbindir}/bcfg2-server
%{_mandir}/man8/bcfg2-admin.8*
%{_mandir}/man8/bcfg2-build-reports.8*
%{_mandir}/man8/bcfg2-info.8*
+%{_mandir}/man8/bcfg2-query.8*
%{_mandir}/man8/bcfg2-repo-validate.8*
+%{_mandir}/man8/bcfg2-remote.8*
%{_mandir}/man8/bcfg2-server.8*
%dir %{_var}/lib/bcfg2
%changelog
+* Mon Nov 12 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.9.5-2
+- Fix oops.
+
+* Mon Nov 12 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.9.5-1
+- Update to 0.9.5 final.
+
+* Mon Nov 05 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.9.5-0.5.pre7
+- Commit new patches to CVS.
+
+* Mon Nov 05 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.9.5-0.4.pre7
+- Update to 0.9.5pre7
+
+* Wed Jun 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.9.4-4
+- Oops, apply right patch
+
+* Wed Jun 27 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.9.4-3
+- Add patch to fix YUMng problem
+
* Mon Jun 25 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.9.4-2
- Bump revision and rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bcfg2/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 26 Jun 2007 03:01:28 -0000 1.5
+++ sources 12 Nov 2007 13:57:36 -0000 1.6
@@ -1 +1 @@
-31f8ff2ce2ce8446898ae85ced2778ca bcfg2-0.9.4.tar.gz
+8f1c942af02124e42c03d9d093d083f2 bcfg2-0.9.5.tar.gz
- Previous message (by thread): rpms/roundcubemail/F-7 roundcubemail.spec,1.3,1.4 sources,1.3,1.4
- Next message (by thread): rpms/bcfg2/F-7 bcfg2-0.9.5pre4-tgenshi.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 bcfg2.spec, 1.11, 1.12 sources, 1.5, 1.6 0001-Fix-name-issue-caused-YUMng-failure.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list