summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-02-13 10:45:19 -0500
committerMichael DeHaan <mdehaan@redhat.com>2008-02-13 10:45:19 -0500
commite37c6b98d8b3678122fad9ddba9c4971e218120c (patch)
tree7d3a5e500024acefec7255fd66b712544828eea9
parentcb940f7bc9b715814ac48269379a6525fa427cdf (diff)
downloadthird_party-cobbler-e37c6b98d8b3678122fad9ddba9c4971e218120c.tar.gz
third_party-cobbler-e37c6b98d8b3678122fad9ddba9c4971e218120c.tar.xz
third_party-cobbler-e37c6b98d8b3678122fad9ddba9c4971e218120c.zip
Added in a possible workaround for a user problem with source_repos in an upgrade scenario (testing needed).
-rw-r--r--cobbler/action_sync.py5
-rw-r--r--cobbler/webui/master.py4
2 files changed, 7 insertions, 2 deletions
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index b889f52..139066e 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -700,6 +700,11 @@ class BootSync:
input_files = []
+ # chance old versions from upgrade do not have a source_repos
+ # workaround for user bug
+ if not blended.has_key("source_repos"):
+ blended["source_repos"] = []
+
# tack on all the install source repos IF there is more than one.
# this is basically to support things like RHEL5 split trees
# if there is only one, then there is no need to do this.
diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py
index ae07b98..e1e0739 100644
--- a/cobbler/webui/master.py
+++ b/cobbler/webui/master.py
@@ -33,8 +33,8 @@ VFN=valueForName
currentTime=time.time
__CHEETAH_version__ = '2.0.1'
__CHEETAH_versionTuple__ = (2, 0, 1, 'final', 0)
-__CHEETAH_genTime__ = 1200929257.00021
-__CHEETAH_genTimestamp__ = 'Mon Jan 21 10:27:37 2008'
+__CHEETAH_genTime__ = 1202486601.6085
+__CHEETAH_genTimestamp__ = 'Fri Feb 8 11:03:21 2008'
__CHEETAH_src__ = 'webui_templates/master.tmpl'
__CHEETAH_srcLastModified__ = 'Tue Jan 15 14:27:10 2008'
__CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine'