diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-05-09 13:11:07 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-05-09 13:11:07 -0400 |
| commit | 34fc9d39389ed2a949b0efbeea246f30a10c0265 (patch) | |
| tree | 0f2a8226077c9c34b68e873dff984976003c52b4 /cobbler | |
| parent | f4a1f5f2f62b5b75a0a327056ea9f34e72e7a50f (diff) | |
| download | third_party-cobbler-34fc9d39389ed2a949b0efbeea246f30a10c0265.tar.gz third_party-cobbler-34fc9d39389ed2a949b0efbeea246f30a10c0265.tar.xz third_party-cobbler-34fc9d39389ed2a949b0efbeea246f30a10c0265.zip | |
Added some additional links for kickstart viewing/editing to the profile/system web pages
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/action_reposync.py | 2 | ||||
| -rw-r--r-- | cobbler/item_profile.py | 2 | ||||
| -rw-r--r-- | cobbler/kickgen.py | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py index 33bfe30..d6b30bc 100644 --- a/cobbler/action_reposync.py +++ b/cobbler/action_reposync.py @@ -254,7 +254,7 @@ class RepoSync: if repo.mirror_locally: line = "baseurl=http://${server}/cobbler/repo_mirror/%s\n" % (repo.name) else: - line = "baseurl=%s" % (repo.mirror) + line = "baseurl=%s\n" % (repo.mirror) config_file.write(line) # user may have options specific to certain yum plugins diff --git a/cobbler/item_profile.py b/cobbler/item_profile.py index 019f01a..c5c9bdb 100644 --- a/cobbler/item_profile.py +++ b/cobbler/item_profile.py @@ -162,7 +162,7 @@ class Profile(item.Item): return utils.set_virt_ram(self,num) def set_virt_type(self,vtype): - return utils.set_virt_Type(self,vtype) + return utils.set_virt_type(self,vtype) def set_virt_bridge(self,vbridge): self.virt_bridge = vbridge diff --git a/cobbler/kickgen.py b/cobbler/kickgen.py index a9bc095..ba8bfd2 100644 --- a/cobbler/kickgen.py +++ b/cobbler/kickgen.py @@ -170,7 +170,10 @@ class KickGen: if line.find("ks_mirror") != -1: ret = True if line.find("baseurl") != -1: - first, baseurl = line.split("=") + try: + first, baseurl = line.split("=",1) + except: + raise CX(_("error scanning repo: %s" % filename)) fd.close() return (ret, baseurl) |