From ccc99edf650eb11671792245efeb812a76ab0fd1 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Fri, 2 Dec 2005 19:06:39 +0000
Subject: version bumps fix export to do tagging

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1610 ce84e21b-d406-0410-9b95-82705330c041
---
 debian/changelog                  | 6 ++++++
 misc/bcfg2.spec                   | 2 +-
 src/lib/Server/Plugin.py          | 2 +-
 src/lib/Server/Plugins/Account.py | 2 +-
 tools/export.sh                   | 3 ++-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8113491fc..34f6ffe2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (0.7.3-1) unstable; urgency=low
+
+  * finally a release
+
+ -- Narayan Desai <desai@mcs.anl.gov>  Fri,  2 Dec 2005 13:02:37 -0600
+
 bcfg2 (0.7.3pre6-1) unstable; urgency=low
 
   * new upstream
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 93377505a..505451cb2 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -1,5 +1,5 @@
 %define name bcfg2
-%define version 0.7.3pre6
+%define version 0.7.3
 %define release 1
 %define pythonversion 2.3
 
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index 72052e7ac..7139d21ab 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -112,7 +112,7 @@ class DirectoryBacked(object):
         elif self.entries.has_key(name):
             syslog(LOG_INFO, "got multiple adds for %s" % name)
         else:
-            if ((name[-1] == '~') or (name[:2] == '.#') or (name == 'SCCS') or (name[-4:] == '.swp')):
+            if ((name[-1] == '~') or (name[:2] == '.#') or (name[-4:] == '.swp') or (name in ['SCCS', '.svn'])):
                 return
             self.entries[name] = self.__child__('%s/%s' % (self.name, name))
             self.entries[name].HandleEvent()
diff --git a/src/lib/Server/Plugins/Account.py b/src/lib/Server/Plugins/Account.py
index bd902fa0b..5d2853e9e 100644
--- a/src/lib/Server/Plugins/Account.py
+++ b/src/lib/Server/Plugins/Account.py
@@ -54,6 +54,6 @@ class Account(Plugin):
         rootlike = [line.split(':', 1) for line in self.repository.entries['rootlike'].data.split()]
         superusers += [user for (user, host) in rootlike if host == metadata.hostname.split('.')[0]]
         rdata = self.repository.entries
-        entry.text = "".join([rdata["%s.key" % user] for user in superusers if rdata.has_key("%s.key" % user)])
+        entry.text = "".join([rdata["%s.key" % user].data for user in superusers if rdata.has_key("%s.key" % user)])
         perms = {'owner':'root', 'group':'root', 'perms':'0600'}
         [entry.attrib.__setitem__(key, value) for (key, value) in perms.iteritems()]
diff --git a/tools/export.sh b/tools/export.sh
index 8ee61d513..edefad86d 100755
--- a/tools/export.sh
+++ b/tools/export.sh
@@ -6,7 +6,8 @@ if [ -z "$version" ] ; then
     echo "must supply version number"
     exit 1
 fi
-
+tagstr=`echo ${version} | sed -e 's/\./_/g'`
+svn copy svn+ssh://terra.mcs.anl.gov/home/desai/svn/bcfg/trunk svn+ssh://terra.mcs.anl.gov/home/desai/svn/bcfg/tags/bcfg2_${tagstr}
 svn export . /tmp/bcfg2-${version}
 svn log -v > /tmp/bcfg2-${version}/ChangeLog
 cd /tmp/bcfg2-${version}/doc
-- 
cgit v1.2.3-1-g7c22