[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at 3c4f112744c0ed5f94ad7174bc3d3fb05b95bc15

[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  3c4f112744c0ed5f94ad7174bc3d3fb05b95bc15 (commit)
      from  bc99123015951a261ffe94d3c2ee474cfe09fa07 (commit)

- Log -----------------------------------------------------------------
commit 3c4f112744c0ed5f94ad7174bc3d3fb05b95bc15
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Mon Jun 25 13:01:36 2007 -0400

    Change profile ID in test script and re-enable deserialize work around.
-----------------------------------------------------------------------

Diffstat:
 build/test-it-all.sh            |    4 ++--
 service/modules/provisioning.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/test-it-all.sh b/build/test-it-all.sh
index 6bd1e6b..6a9b0b2 100755
--- a/build/test-it-all.sh
+++ b/build/test-it-all.sh
@@ -315,8 +315,8 @@ deploy_a_system()
 
     # FIXME: this is a bit hardcode at
     web_login
-    echo curl  -s -w "%{http_code}\n" -L  -b $COOKIES_FILE -c $COOKIES_FILE  -d "form[machine_id]='0'&form[profile_id]=2&form[puppet_node_diff]=&submit='Add'" http://$DEPLOY_HOST/vf/deployment/edit_submit
-    RET_CODE=`curl  -s -w "%{http_code}\n" -L  -b $COOKIES_FILE -c $COOKIES_FILE  -d "form[machine_id]='0'&form[profile_id]=2&form[puppet_node_diff]=&submit='Add'" http://$DEPLOY_HOST/vf/deployment/edit_submit`
+    echo curl  -s -w "%{http_code}\n" -L  -b $COOKIES_FILE -c $COOKIES_FILE  -d "form[machine_id]='1'&form[profile_id]=2&form[puppet_node_diff]=&submit='Add'" http://$DEPLOY_HOST/vf/deployment/edit_submit
+    RET_CODE=`curl  -s -w "%{http_code}\n" -L  -b $COOKIES_FILE -c $COOKIES_FILE  -d "form[machine_id]='1'&form[profile_id]=2&form[puppet_node_diff]=&submit='Add'" http://$DEPLOY_HOST/vf/deployment/edit_submit`
     echo "Provisioming a system returned $RET_CODE"
 
 
diff --git a/service/modules/provisioning.py b/service/modules/provisioning.py
index 2e1f1fa..8c39520 100755
--- a/service/modules/provisioning.py
+++ b/service/modules/provisioning.py
@@ -332,7 +332,7 @@ class CobblerTranslatedSystem:
        # of Cobbler State not having the profile in memory
        # but having it on disk.  Workaround only.
        # this should NOT be neccessary.
-       # cobbler_api.deserialize() # load from file! # UNFIXMED
+       cobbler_api.deserialize() # load from file! # UNFIXMED
 
        new_item = cobbler_api.new_system()
        self.logger.info("debugging cobbler profiles")
@@ -435,7 +435,7 @@ class Provisioning(web_svc.AuthWebSvc):
       
       try:
          cobbler_api = config_data.Config().cobbler_api
-         #cobbler_api.deserialize()
+         # cobbler_api.deserialize()
          cobbler_repos    = cobbler_api.repos()   
          cobbler_distros  = cobbler_api.distros()
          cobbler_profiles = cobbler_api.profiles()

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  bc99123015951a261ffe94d3c2ee474cfe09fa07 \
  3c4f112744c0ed5f94ad7174bc3d3fb05b95bc15