summaryrefslogtreecommitdiffstats
path: root/cobbler
diff options
context:
space:
mode:
Diffstat (limited to 'cobbler')
-rw-r--r--cobbler/action_reposync.py2
-rw-r--r--cobbler/webui/master.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py
index 6e62489..462da47 100644
--- a/cobbler/action_reposync.py
+++ b/cobbler/action_reposync.py
@@ -244,7 +244,7 @@ class RepoSync:
config_file.write("%s=%s\n" % (x, repo.yumopts[x]))
else:
line = "baseurl=%s\n" % repo.mirror
- http_server = self.settings.server + ":" + self.settings.http_port
+ http_server = "%s:%s" % (self.settings.server, self.settings.http_port)
line = line.replace("@@server@@",http_server)
config_file.write(line)
config_file.write("enabled=1\n")
diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py
index 2e542e8..a4485ac 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__ = 1203105321.7213049
-__CHEETAH_genTimestamp__ = 'Fri Feb 15 14:55:21 2008'
+__CHEETAH_genTime__ = 1203536023.5055339
+__CHEETAH_genTimestamp__ = 'Wed Feb 20 14:33:43 2008'
__CHEETAH_src__ = 'webui_templates/master.tmpl'
__CHEETAH_srcLastModified__ = 'Fri Feb 15 14:47:43 2008'
__CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine'