Merge branch 'master' into devel

Conflicts:

	CHANGELOG
	cobbler.spec
	cobbler/item_repo.py
	setup.py

5 files changed, 29 insertions, 13 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 9d67e345..0ebc4224 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,11 +18,12 @@ Cobbler CHANGELOG
 - (BUGF) minor tweak to the blender function to remove a certain class of typing errors where a string is being blended with a list, should not have any noticable effect on existing installs
 - (BUGF) add missing import of "_" in remote.py
 
-- ??? - 1.2.5 (pending)
+- Fri Sep 26 2008 - 1.2.5
 - (BUGF) expose --arch for "cobbler image add"
 - (BUGF) unbreak dnsmasq DHCP management, similar to ISC bug
 - (BUGF) fix --arch for cobbler distro add/edit
 - (BUGF) fix merge error with remote.py's remove_profile function (fix webapp)
+- (BUGF) makekeep_updated and mirror_locally checkboxes in WebUI display correctly
 
 - Mon Sep 08 2008 - 1.2.4
 - (BUGF) simple rebuild to remove cli_report.py, which is not in git
diff --git a/cobbler.spec b/cobbler.spec
index 7eafaaf0..21435c14 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -228,11 +228,14 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-* Mon Sep 15 2008 Michael DeHaan <mdehaan@redhat.com> - 1.3.0-1
+* Fri Sep 26 2008 Michael DeHaan <mdehaan@redhat.com> - 1.3.0-1
 - Upstream changes (see CHANGELOG)
 - added sample.seed file
 - added /usr/bin/cobbler-ext-nodes
 
+* Fri Sep 26 2008 Michael DeHaan <mdehaan@redhat.com> - 1.2.5-1
+- Upstream changes (see CHANGELOG)
+
 * Mon Sep 08 2008 Michael DeHaan <mdehaan@redhat.com> - 1.2.4-1
 - Rebuild
 
@@ -240,7 +243,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 - Upstream changes (see CHANGELOG)
 
 * Fri Sep 05 2008 Michael DeHaan <mdehaan@redhat.com> - 1.2.2-1
->>>>>>> master:cobbler.spec
 - Upstream changes (see CHANGELOG)
 
 * Tue Sep 02 2008 Michael DeHaan <mdehaan@redhat.com> - 1.2.1-1
diff --git a/cobbler/item_repo.py b/cobbler/item_repo.py
index 53ce8e6b..b9958ef6 100644
--- a/cobbler/item_repo.py
+++ b/cobbler/item_repo.py
@@ -41,7 +41,7 @@ class Repo(item.Item):
         self.name             = None
         # FIXME: subobject code does not really make sense for repos
         self.mirror           = (None,       '<<inherit>>')[is_subobject]
-        self.keep_updated     = ('y',        '<<inherit>>')[is_subobject]
+        self.keep_updated     = (True,        '<<inherit>>')[is_subobject]
         self.priority         = (99,         '<<inherit>>')[is_subobject]
         self.rpm_list         = ("",         '<<inherit>>')[is_subobject]
         self.createrepo_flags = ("-c cache", '<<inherit>>')[is_subobject]
@@ -49,13 +49,13 @@ class Repo(item.Item):
         self.arch             = "" # use default arch
         self.yumopts          = {}
         self.owners           = self.settings.default_ownership
-        self.mirror_locally   = 1
+        self.mirror_locally   = True
 
     def from_datastruct(self,seed_data):
         self.parent           = self.load_item(seed_data, 'parent')
         self.name             = self.load_item(seed_data, 'name')
         self.mirror           = self.load_item(seed_data, 'mirror')
-        self.keep_updated     = self.load_item(seed_data, 'keep_updated','y')
+        self.keep_updated     = self.load_item(seed_data, 'keep_updated',True)
         self.priority         = self.load_item(seed_data, 'priority',99)
         self.rpm_list         = self.load_item(seed_data, 'rpm_list')
         self.createrepo_flags = self.load_item(seed_data, 'createrepo_flags', '-c cache')
@@ -63,10 +63,11 @@ class Repo(item.Item):
         self.depth            = self.load_item(seed_data, 'depth', 2)
         self.yumopts          = self.load_item(seed_data, 'yumopts', {})
         self.owners           = self.load_item(seed_data, 'owners', self.settings.default_ownership)
-        self.mirror_locally   = self.load_item(seed_data, 'mirror_locally', '1')
+        self.mirror_locally   = self.load_item(seed_data, 'mirror_locally', True)
 
         # coerce types from input file
         self.set_keep_updated(self.keep_updated)
+        self.set_mirror_locally(self.mirror_locally)
         self.set_owners(self.owners)
 
         return self
diff --git a/setup.py b/setup.py
index b50e7d33..972eccb2 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,11 @@ import os.path
 from distutils.core import setup, Extension
 import string
 
+<<<<<<< HEAD:setup.py
 VERSION = "1.3.0"
+=======
+VERSION = "1.2.5"
+>>>>>>> master:setup.py
 SHORT_DESC = "Network Boot and Update Server"
 LONG_DESC = """
 Cobbler is a network boot and update server.  Cobbler supports PXE, provisioning virtualized images, and reinstalling existing Linux machines.  The last two modes require a helper tool called 'koan' that integrates with cobbler.  Cobbler's advanced features include importing distributions from DVDs and rsync mirrors, kickstart templating, integrated yum mirroring, and built-in DHCP/DNS Management.  Cobbler also has a Python and XMLRPC API for integration with other applications.
diff --git a/webui_templates/repo_edit.tmpl b/webui_templates/repo_edit.tmpl
index 0794d2b5..cf7f82fc 100644
--- a/webui_templates/repo_edit.tmpl
+++ b/webui_templates/repo_edit.tmpl
@@ -85,9 +85,13 @@ function disablename(value)
     <label for="keep_updated">Keep Updated</label>
     </td>
     <td>
-    <input type="checkbox" name="keep_updated" id="keep_updated"
-        #if (not $repo) or $repo.keep_updated
-            checked="true"  
+    <input type="checkbox" name="keep_updated" id="keep_updated" 
+        #if $repo 
+            #if str($repo.keep_updated) != "False"
+                checked="true"  
+            #end if
+        #else
+            checked="true"
         #end if
     />
     <p class="context-tip">Uncheck to prevent the mirror from being updated again.</p>    
@@ -100,9 +104,13 @@ function disablename(value)
     <label for="keep_updated">Mirror Locally</label>
     </td>
     <td>
-    <input type="checkbox" name="mirror_locally" id="mirror_locally"
-        #if (not $repo) or $repo.mirror_locally
-            checked="true"
+    <input type="checkbox" name="mirror_locally" id="mirror_locally" 
+        #if $repo 
+            #if str($repo.mirror_locally) != "False"
+                checked="true"
+            #end if
+        #else
+                checked="true"
         #end if
     />
     <p class="context-tip">Uncheck to reference the repository directly instead of mirroring.</p>