[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at 4701460c6aa31a91009deca0d0afc5c7c1a87013

[Michael DeHaan]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  4701460c6aa31a91009deca0d0afc5c7c1a87013 (commit)
      from  24cfab3a916606aef28308d041cc043ac452d2e9 (commit)

- Log -----------------------------------------------------------------
commit 4701460c6aa31a91009deca0d0afc5c7c1a87013
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Wed Jun 27 13:39:12 2007 -0400

    Minor WUI cleanup, plus make the delete call (for deployments) be more tolerant of error codes
    and also delete the Xen disk image.
-----------------------------------------------------------------------

Diffstat:
 nodes/modules/virt.py                   |    5 ++++-
 wui/src/app/views/deployment/list.rhtml |    2 +-
 wui/src/app/views/user/edit.rhtml       |    2 +-
 wui/src/app/views/user/list.rhtml       |    2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nodes/modules/virt.py b/nodes/modules/virt.py
index d1d606a..e5c1040 100755
--- a/nodes/modules/virt.py
+++ b/nodes/modules/virt.py
@@ -149,7 +149,10 @@ class Virt(web_svc.WebSvc):
         by deleting the disk image and it's configuration file.
         """
 
-        return self.__xm_command("undefine", mac_address, [ "off" ] )
+        # make sure the machine is off, no warning time given
+        killcode = self.__xm_command("destroy", mac_address, None)
+        # allow it to be deleted -- use virsh for this as XM can't do it (?)
+        return subprocess.call(["/usr/bin/virsh","undefine",mac_address], shell=True)
 
     #=======================================================================
 
diff --git a/wui/src/app/views/deployment/list.rhtml b/wui/src/app/views/deployment/list.rhtml
index 8581694..724a9db 100755
--- a/wui/src/app/views/deployment/list.rhtml
+++ b/wui/src/app/views/deployment/list.rhtml
@@ -16,7 +16,7 @@
             <th colspan="2"><%= _("Actions") %></th>
          </thead>
       <% else %>
-         <%= _("There are no virtual profiles created or deployed yet.  Use the \"Add\" link to create one.") %>
+         <%= _("There are no guests yet.  Use the \"Add\" link to create one.") %>
       <% end %>
 
       <%# FIXME: this may be a result of what objects are being sent over from Python. %>
diff --git a/wui/src/app/views/user/edit.rhtml b/wui/src/app/views/user/edit.rhtml
index 398bf72..75e569e 100755
--- a/wui/src/app/views/user/edit.rhtml
+++ b/wui/src/app/views/user/edit.rhtml
@@ -37,7 +37,7 @@
             <TD><%= f.text_area :description %></TD>
          </TR>
          <TR> 
-            <TD>email</TD>
+            <TD><%= _("Email") %></TD>
             <TD><%= f.text_field :email %></TD>
          </TR>
          <TR>
diff --git a/wui/src/app/views/user/list.rhtml b/wui/src/app/views/user/list.rhtml
index 44466d1..812a40b 100755
--- a/wui/src/app/views/user/list.rhtml
+++ b/wui/src/app/views/user/list.rhtml
@@ -1,4 +1,4 @@
-      <% @page_title = "View virt-factory Users" %>
+      <% @page_title = "View Users" %>
       <% @primary = "user" %>
       <% @secondary = "list" %>
      

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  24cfab3a916606aef28308d041cc043ac452d2e9 \
  4701460c6aa31a91009deca0d0afc5c7c1a87013