diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-02-20 15:04:38 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-02-20 15:04:38 -0500 |
| commit | 01a4668737539ed1a68d4e6cc35d09eaa15d3d02 (patch) | |
| tree | 97a7f3da032929ee6fe76fb229ee2f6e1665b6b7 /cobbler | |
| parent | d8056b0eaf2be1413625afe27600c7c5f8f4bee3 (diff) | |
| download | third_party-cobbler-01a4668737539ed1a68d4e6cc35d09eaa15d3d02.tar.gz third_party-cobbler-01a4668737539ed1a68d4e6cc35d09eaa15d3d02.tar.xz third_party-cobbler-01a4668737539ed1a68d4e6cc35d09eaa15d3d02.zip | |
This is 0.8.1
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/action_reposync.py | 2 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 |
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' |