[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at v0.0.3-45-g4389f70

[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  4389f702db94b129afc56638a769fcfdc2a1d6ab (commit)
       via  7d9c684ed3227e449df2b60d13c39bc870fff378 (commit)
      from  01202c77d090a2b41816dda8fbb275de0d27c959 (commit)

- Log -----------------------------------------------------------------
commit 4389f702db94b129afc56638a769fcfdc2a1d6ab
Merge: 7d9c684... 01202c7...
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Wed Jul 25 12:32:56 2007 -0400

    Merge branch 'master' of git+ssh://g-mdehaan@et.redhat.com/git/virt-factory

commit 7d9c684ed3227e449df2b60d13c39bc870fff378
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Wed Jul 25 12:32:40 2007 -0400

    Ensure deletes of virtual guests go through to the DB.
-----------------------------------------------------------------------

Diffstat:
 service/modules/deployment.py |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/service/modules/deployment.py b/service/modules/deployment.py
index 349afd1..05a5e05 100755
--- a/service/modules/deployment.py
+++ b/service/modules/deployment.py
@@ -257,6 +257,16 @@ class Deployment(web_svc.AuthWebSvc):
         dargs = self.get(token, { "id" : args["id" ]}).data
         self.__set_locked(token, dargs, DEPLOYMENT_STATE_DELETING, True)
         self.__queue_operation(token, dargs, TASK_OPERATION_DELETE_VIRT)
+
+        # FIXME/NOTE: there may be situations where the above operation fails in
+        # which case it is the job of taskatron to ensure the virtual machine
+        # perishes.  It will be removed from the WUI immediately here. This
+        # behavior can probably be improved somewhat but seems better than
+        # having a non-existant undeletable entry stick around in the WUI.
+
+        session = db.open_session()
+        db.Deployment.delete(session, args['id'])
+
         return success() # FIXME: always?
 
     def pause(self, token, args):

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  01202c77d090a2b41816dda8fbb275de0d27c959 \
  4389f702db94b129afc56638a769fcfdc2a1d6ab