summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xLabController/triggers/sync/post/osversion.trigger2
-rw-r--r--beaker.spec4
2 files changed, 5 insertions, 1 deletions
diff --git a/LabController/triggers/sync/post/osversion.trigger b/LabController/triggers/sync/post/osversion.trigger
index 6bd01fa..c60ba31 100755
--- a/LabController/triggers/sync/post/osversion.trigger
+++ b/LabController/triggers/sync/post/osversion.trigger
@@ -61,6 +61,8 @@ def get_paths(distro):
break
else:
path = path[1:]
+ # This removes everything before the first slash.
+ path = path[path.find('/'):]
tree_path_re = re.compile(r'(.*%s)' % path)
if tree_path_re.search(kerneldir):
tree_path = tree_path_re.search(kerneldir).group(1)
diff --git a/beaker.spec b/beaker.spec
index 1df9f58..a145246 100644
--- a/beaker.spec
+++ b/beaker.spec
@@ -2,7 +2,7 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: beaker
-Version: 0.4.12
+Version: 0.4.13
Release: 0%{?dist}
Summary: Filesystem layout for Beaker
Group: Applications/Internet
@@ -132,6 +132,8 @@ ln -s RedHatEnterpriseLinux6.ks $RPM_BUILD_ROOT/var/lib/cobbler/kickstarts/redha
/usr/share/man/man1/beakerlib*
%changelog
+* Mon Jun 22 2009 Bill Peck <bpeck@redhat.com> - 0.4.13-0
+- Fixed osversion.trigger to work with methods other than nfs
* Fri Jun 19 2009 Bill Peck <bpeck@redhat.com> - 0.4.12-0
- Raise BeakerExceptions if we run into trouble
* Thu Jun 18 2009 Bill Peck <bpeck@redhat.com> - 0.4.11-0