From 0d64de62b3a0b011a51d390c8ee1b91820479950 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 29 Oct 2007 11:45:16 -0400 Subject: Add --arch back to docs, plus WebUI changes to add the field. --- cobbler/item_repo.py | 1 + cobbler/webui/CobblerWeb.py | 6 +++++- docs/cobbler.pod | 6 +++++- webui_templates/repo_edit.tmpl | 16 ++++++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/cobbler/item_repo.py b/cobbler/item_repo.py index 84fcf1f..106759d 100644 --- a/cobbler/item_repo.py +++ b/cobbler/item_repo.py @@ -185,6 +185,7 @@ class Repo(item.Item): def remote_methods(self): return { 'name' : self.set_name, + 'arch' : self.set_arch, 'mirror-name' : self.set_name, 'mirror' : self.set_mirror, 'keep-updated' : self.set_keep_updated, diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py index 93b47da..eb82564 100644 --- a/cobbler/webui/CobblerWeb.py +++ b/cobbler/webui/CobblerWeb.py @@ -679,7 +679,7 @@ class CobblerWeb(object): def repo_save(self,name=None,oldname=None,new_or_edit=None,editmode="edit", mirror=None,keep_updated=None,local_filename=None, - rpm_list=None,createrepo_flags=None,delete1=None,delete2=None,**args): + rpm_list=None,createrepo_flags=None,arch=None,delete1=None,delete2=None,**args): if not self.__xmlrpc_setup(): return self.login(message=INVALID_CREDS) @@ -725,7 +725,11 @@ class CobblerWeb(object): self.remote.modify_repo(repo, 'rpm-list', rpm_list, self.token) if createrepo_flags: self.remote.modify_distro(repo, 'createrepo-flags', createrepo_flags, self.token) + if arch: + self.remote.modify_distro(repo, 'arch', arch, self.token) + self.remote.save_repo(repo, self.token) + except Exception, e: log_exc() return self.error_page("Error while saving repo: %s" % str(e)) diff --git a/docs/cobbler.pod b/docs/cobbler.pod index e1b76f7..e46415a 100644 --- a/docs/cobbler.pod +++ b/docs/cobbler.pod @@ -270,7 +270,7 @@ on your network will result in faster, more up-to-date installations and faster are only provisioning a home setup, this will probably be overkill, though it can be very useful for larger setups (labs, datacenters, etc). -B +B =over @@ -335,6 +335,10 @@ Specifies optional flags to feed into the createrepo tool, which is called when Specifies that the named repository should not be updated during a normal "cobbler reposync". The repo may still be updated by name. See "cobbler reposync" below. +=item arch + +Specifies what architecture the repository should use. By default the current system arch (of the server) is used, which may not be desirable. Using this to override the default arch allows mirroring of source repositories (using --arch=src). + =back =head2 DISPLAYING CONFIGURATION ENTRIES diff --git a/webui_templates/repo_edit.tmpl b/webui_templates/repo_edit.tmpl index 100997d..d7ea016 100644 --- a/webui_templates/repo_edit.tmpl +++ b/webui_templates/repo_edit.tmpl @@ -135,6 +135,22 @@ function disablename(value) + + + + + + +

Overrides the local system arch when mirroring with yum.

+ + + + + #if $repo -- cgit