summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2009-10-28 11:02:04 -0400
committerBill Peck <bpeck@redhat.com>2009-10-28 11:02:04 -0400
commitb994947ee9b417ccacae51f8fabaa1bd59151ad7 (patch)
tree422d1f5669ef150e4394cfd374747a05e605e59a
parent20f06284fdc89b8b936d361d973c47b74ccac424 (diff)
dont try and power off systems that have been temporarily reserved by rhtsbeaker-0_4_57
-rw-r--r--Server/beaker/server/controllers.py16
-rw-r--r--beaker.spec6
2 files changed, 13 insertions, 9 deletions
diff --git a/Server/beaker/server/controllers.py b/Server/beaker/server/controllers.py
index bd8e678..054aeb4 100644
--- a/Server/beaker/server/controllers.py
+++ b/Server/beaker/server/controllers.py
@@ -1336,14 +1336,14 @@ class Root(RPCRoot):
return (0, "Invalid system")
if system.user == user:
if mylog:
- activity = SystemActivity(system.user, "VIA %s" % identity.current.user, "Returned", "User", "%s" % system.user, '')
- system.activity.append(activity)
- try:
- system.action_release()
- except BX, error:
- msg = "Failed to power off system: %s" % error
- activity = SystemActivity(systen.user, "VIA %s" % identity.current.user, "Off", "Power", "", msg)
- system.activity.append(activity)
+ system.activity.append(SystemActivity(system.user, "VIA %s" % identity.current.user, "Returned", "User", "%s" % system.user, ''))
+ try:
+ system.action_release()
+ except BX, error:
+ msg = "Failed to power off system: %s" % error
+ system.activity.append(SystemActivity(systen.user, "VIA %s" % identity.current.user, "Off", "Power", "", msg))
+ else:
+ system.user = None
return
diff --git a/beaker.spec b/beaker.spec
index 5e2a46f..eff0570 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.56
+Version: 0.4.57
Release: 0%{?dist}
Summary: Filesystem layout for Beaker
Group: Applications/Internet
@@ -133,6 +133,10 @@ ln -s Fedora.ks $RPM_BUILD_ROOT/var/lib/cobbler/kickstarts/Fedoradevelopment.ks
/usr/share/man/man1/beakerlib*
%changelog
+* Wed Oct 28 2009 Bill Peck <bpeck@redhat.com> - 0.4.57-0
+- New search implemented by Raymond Mancy
+- don't try and power off machines that were temporarily reserved by legacy rhts
+- view groups for non admin users
* Fri Oct 16 2009 Bill Peck <bpeck@redhat.com> - 0.4.53-0
- fix allows custom kickstarts to still append packages
* Tue Oct 06 2009 Bill Peck <bpeck@redhat.com> - 0.4.52-0