[Et-mgmt-commits-list] [SCM] cobbler branch, master now at v0.4.8-50-g16ae9ab

[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  16ae9ab051e68a74a3d0a509835e5e33116807a4 (commit)
       via  4edf5d24889cca32fda7bf37d1a54ea6214de101 (commit)
      from  6b8331279384f6376269ded47b88b6fd64cfa288 (commit)

- Log -----------------------------------------------------------------
commit 16ae9ab051e68a74a3d0a509835e5e33116807a4
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Thu Jun 21 18:27:46 2007 -0400

    Repos should default to autosync.

commit 4edf5d24889cca32fda7bf37d1a54ea6214de101
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Thu Jun 21 18:25:43 2007 -0400

    Fix status printing
-----------------------------------------------------------------------

Diffstat:
 cobbler/action_status.py |   32 ++++++++++++++++----------------
 cobbler/action_sync.py   |    6 +++---
 cobbler/item_repo.py     |    4 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/cobbler/action_status.py b/cobbler/action_status.py
index 69ba734..b1bca72 100644
--- a/cobbler/action_status.py
+++ b/cobbler/action_status.py
@@ -113,14 +113,14 @@ class BootStatusReport:
         time_collisions = 0
         
         #header = ("Address", "State", "Started", "Last Request", "Seconds", "Log Entries")
-        print _("%-20(address)s | %-15(state)s | %-25(started)s | %-25(lastreq)s | %-10(seconds)s | %-6(logentries)s") % {
-           "address"    : _("Address"),
-           "state"      : _("State"),
-           "lastreq"    : _("Last Request"),
-           "started"    : _("Started"),
-           "seconds"    : _("Seconds"),
-           "logentries" : _("Log Entries"),
-        } 
+        print _("%-20s | %-15s | %-25s | %-25s | %-10s | %-6s") % (
+           _("Address"),
+           _("State"),
+           _("Last Request"),
+           _("Started"),
+           _("Seconds"),
+           _("Log Entries")
+        )
 
         
         for ip in ips:
@@ -214,13 +214,13 @@ class BootStatusReport:
             elapsed_time  = "?"   
   
         # print the status line for this IP address
-        print "%-20(ip)s | %-15(state)s | %-25(start)s | %-25(last)s | %-10(elapsed)s | %-6(fcount)s" % {
-            "ip"      : ip, 
-            "state"   : install_state, 
-            "start"   : display_start, 
-            "last"    : display_last, 
-            "elapsed" : elapsed_time, 
-            "fcount"  : fcount
-        }            
+        print "%-20s | %-15s | %-25s | %-25s | %-10s | %-6s" % (
+            ip, 
+            install_state, 
+            display_start, 
+            display_last, 
+            elapsed_time, 
+            fcount
+        )           
  
 
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index 9648a16..bd60a50 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -224,9 +224,9 @@ class BootSync:
         fh.close()
 
 
-    def templatify(self, data, metadata, outfile):
-        for x in metadata.keys():
-            template_data = template_data.replace("$%s" % x, metadata[x])
+    #def templatify(self, data, metadata, outfile):
+    #    for x in metadata.keys():
+    #        template_data = template_data.replace("$%s" % x, metadata[x])
 
     def clean_trees(self):
         """
diff --git a/cobbler/item_repo.py b/cobbler/item_repo.py
index 19b2e3f..c15b97d 100644
--- a/cobbler/item_repo.py
+++ b/cobbler/item_repo.py
@@ -31,7 +31,7 @@ class Repo(item.Item):
         self.parent           = None
         self.name             = None
         self.mirror           = (None,       '<<inherit>>')[is_subobject]
-        self.keep_updated     = (None,       '<<inherit>>')[is_subobject]
+        self.keep_updated     = ('y',        '<<inherit>>')[is_subobject]
         self.local_filename   = ("",         '<<inherit>>')[is_subobject]
         self.rpm_list         = ("",         '<<inherit>>')[is_subobject]
         self.createrepo_flags = ("-c cache", '<<inherit>>')[is_subobject]
@@ -41,7 +41,7 @@ class Repo(item.Item):
         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')
+        self.keep_updated     = self.load_item(seed_data, 'keep_updated','y')
         self.local_filename   = self.load_item(seed_data, 'local_filename')
         self.rpm_list         = self.load_item(seed_data, 'rpm_list')
         self.createrepo_flags = self.load_item(seed_data, 'createrepo_flags', '-c cache')

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  6b8331279384f6376269ded47b88b6fd64cfa288 \
  16ae9ab051e68a74a3d0a509835e5e33116807a4