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

[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  078098f67e5740a3056eb6b5d0d12c1f5f01fe5f (commit)
       via  19b0211d8efdc1cf61dc1c96140b1622d242b2b9 (commit)
       via  119f8ddb8d6b26b9a6c9b95375b6e30eb9fbeaf2 (commit)
       via  ace3c0c56289690c48a309becabf9afcf7435c51 (commit)
       via  c8b59c766c62aa8d2032ade1313590663b644d00 (commit)
      from  280b4d38a4caf3cb10cf7ac76eb9577a9dd17e86 (commit)

- Log -----------------------------------------------------------------
commit 078098f67e5740a3056eb6b5d0d12c1f5f01fe5f
Merge: 19b0211... 280b4d3...
Author: Michael DeHaan <mdehaan at redhat.com>
Date:   Tue Aug 7 15:52:32 2007 -0400

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

commit 19b0211d8efdc1cf61dc1c96140b1622d242b2b9
Author: Michael DeHaan <mdehaan at redhat.com>
Date:   Tue Aug 7 15:52:13 2007 -0400

    f7 not fc7

commit 119f8ddb8d6b26b9a6c9b95375b6e30eb9fbeaf2
Merge: ace3c0c... c4cda69...
Author: Michael DeHaan <mdehaan at redhat.com>
Date:   Mon Aug 6 18:22:55 2007 -0400

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

commit ace3c0c56289690c48a309becabf9afcf7435c51
Author: Michael DeHaan <mdehaan at redhat.com>
Date:   Mon Aug 6 18:17:07 2007 -0400

    Do not clobber "tree" metadata in distro objects

commit c8b59c766c62aa8d2032ade1313590663b644d00
Author: Michael DeHaan <mdehaan at redhat.com>
Date:   Mon Aug 6 17:47:30 2007 -0400

    always add distros (seems to work better)
-----------------------------------------------------------------------

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

diff --git a/build/settings b/build/settings
index 54f84f6..73471c5 100755
--- a/build/settings
+++ b/build/settings
@@ -6,7 +6,7 @@ logs:
 repos:
     vf_repo: 'VF_REPO'
 mirrors:
-    F-7: [ '/mnt/engarchive2/released/F-7/GOLD/Fedora/',  'nfs://engarchive.rdu.redhat.com:/engineering/archives2/released/F-7/GOLD/Fedora/' ]
+    F-7: [ '/mnt/engarchive2/released/F-7/GOLD/Fedora/',  '' ]
 this_server:
     address: 'ADDRESS'
 extras_rpms:
diff --git a/build/test-it-all.sh b/build/test-it-all.sh
index a9f6b11..55a8451 100755
--- a/build/test-it-all.sh
+++ b/build/test-it-all.sh
@@ -22,7 +22,7 @@ BUILD_PATH="/tmp/vf-test"
 # that the code will be running on
 VF_SERVER="http://172.16.59.215"
 
-ARCH="fc7"
+ARCH="f7"
 
 # er, variables...
 
diff --git a/service/modules/provisioning.py b/service/modules/provisioning.py
index 4dfb2b0..3534870 100755
--- a/service/modules/provisioning.py
+++ b/service/modules/provisioning.py
@@ -141,26 +141,20 @@ class CobblerTranslatedDistribution:
    def __init__(self,cobbler_api,from_db):
        if from_db.has_key("id") and from_db["id"] < 0:
            return
-       found = cobbler_api.distros().find(from_db["name"])
-       if found is None:
-           # this should only occur when someone deletes the cobbler
-           # distro but we still have any entry in the VF DB.
-           # thus the cobbler object can be modified outside of VF
-           # and will not get "hacked" by VF unless it ceases to
-           # exist.  To ensure advanced cobbler features can still
-           # be used (adding new ksmeta attributes, etc) this is how
-           # we want to have things -- MPD.
-           new_item = cobbler_api.new_distro()
-           new_item.set_name(from_db["name"])
-           new_item.set_kernel(from_db["kernel"])
-           new_item.set_initrd(from_db["initrd"])
-           if from_db.has_key("kernel_options"):
-               new_item.set_kernel_options(from_db["kernel_options"])
-           new_item.set_arch(COBBLER_ARCH_MAPPING[from_db["architecture"]])
-           ks_meta = {}
-           if from_db.has_key("kickstart_metadata"):
-               (rc, ks_meta) = input_string_or_hash(from_db["kickstart_metadata"])
-           cobbler_api.distros().add(new_item, with_copy=True)
+       if cobbler_api.distros().find(from_db["name"]):
+           # do not reclobber, or we'll erase the tree info!
+           return
+       new_item = cobbler_api.new_distro()
+       new_item.set_name(from_db["name"])
+       new_item.set_kernel(from_db["kernel"])
+       new_item.set_initrd(from_db["initrd"])
+       if from_db.has_key("kernel_options"):
+           new_item.set_kernel_options(from_db["kernel_options"])
+       new_item.set_arch(COBBLER_ARCH_MAPPING[from_db["architecture"]])
+       ks_meta = {}
+       if from_db.has_key("kickstart_metadata"):
+           (rc, ks_meta) = input_string_or_hash(from_db["kickstart_metadata"])
+       cobbler_api.distros().add(new_item, with_copy=True)
 
 #--------------------------------------------------------------------
 

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  280b4d38a4caf3cb10cf7ac76eb9577a9dd17e86 \
  078098f67e5740a3056eb6b5d0d12c1f5f01fe5f