Add --createrepo-flags (in "cobbler repo add") to the manpage, also add "-c

cache" as a default value.

5 files changed, 17 insertions, 9 deletions

diff --git a/AUTHORS b/AUTHORS
index 9fe4bba..b357819 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Patches and other contributions from:
     Jim Meyering <jim@meyering.net>
     Mihai Ibanescu <mihai.ibanescu@gmail.com>
     Tru Huynh <tru@pasteur.fr>
+    Perry Myers <pmyers@redhat.com>
     Adam Rosenwald <thestrider@gmail.com>
     Scott Seago <sseago@redhat.com>
 
diff --git a/CHANGELOG b/CHANGELOG
index d2100bf..bfc042b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,8 @@ Cobbler CHANGELOG
 - Optionally use dnsmasq for DHCP (and DNS!) instead of ISC dhcpd.
 - Add --mac and remove requirement for --name to be an ip, mac, or hostname.
 - Manpage cleanup
+- Patch to allow pre and post triggers
+- Patch to allow --createrepo-flags and to cache on import, fix multiple calls to createrepo
 
 * Thu Apr 26 2007 - 0.4.8
 - Make import friendlier for older distros
diff --git a/cobbler/cobbler.py b/cobbler/cobbler.py
index a9efd95..e999d2d 100755
--- a/cobbler/cobbler.py
+++ b/cobbler/cobbler.py
@@ -433,7 +433,7 @@ class BootCLI:
            '--keep-updated'     :  lambda(a): repo.set_keep_updated(a),
            '--local-filename'   :  lambda(a): repo.set_local_filename(a),
            '--rpm-list'         :  lambda(a): repo.set_rpm_list(a),
-           '--createrepo-flags' :  lambda(a): repo.set_createrepo_flags(a),
+           '--createrepo-flags' :  lambda(a): repo.set_createrepo_flags(a)
         }
         def on_ok():
             if newname is not None:
diff --git a/cobbler/item_repo.py b/cobbler/item_repo.py
index ac224fe..f58cd1b 100644
--- a/cobbler/item_repo.py
+++ b/cobbler/item_repo.py
@@ -26,12 +26,12 @@ class Repo(item.Item):
         return cloned
 
     def clear(self):
-        self.name = None                             # is required 
-        self.mirror = None                           # is required
-        self.keep_updated = 1                        # has reasonable defaults
-        self.local_filename = ""                     # off by default
-        self.rpm_list = ""                           # just get selected RPMs + deps
-        self.createrepo_flags = ""                   # none by default
+        self.name = None                    # is required 
+        self.mirror = None                  # is required
+        self.keep_updated = 1               # has reasonable defaults
+        self.local_filename = ""            # off by default
+        self.rpm_list = ""                  # just get selected RPMs + deps
+        self.createrepo_flags = "-c cache"  # none by default
 
     def from_datastruct(self,seed_data):
         self.name             = self.load_item(seed_data, 'name')
@@ -39,7 +39,7 @@ class Repo(item.Item):
         self.keep_updated     = self.load_item(seed_data, 'keep_updated')
         self.local_filename   = self.load_item(seed_data, 'local_filename')
         self.rpm_list         = self.load_item(seed_data, 'rpm_list')
-        self.createrepo_flags = self.load_item(seed_data, 'createrepo_flags')
+        self.createrepo_flags = self.load_item(seed_data, 'createrepo_flags', '-c cache')
         return self
 
     def set_name(self,name):
diff --git a/docs/cobbler.pod b/docs/cobbler.pod
index 4e8a134..4192c19 100644
--- a/docs/cobbler.pod
+++ b/docs/cobbler.pod
@@ -199,7 +199,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<cobbler repo add --mirror=url --name=string [--local-filename=string]>
+B<cobbler repo add --mirror=url --name=string [--local-filename=string] [--rpmlist=list] [--creatrepo-flags=string]>
 
 =over
 
@@ -258,6 +258,11 @@ games.  To do this, use --rpm-list="cobbler koan".
 This option only works for http:// and ftp:// repositories.  It will be ignored for other
 mirror types, such as local paths and rsync:// mirrors.
 
+=item createrepo-flags
+
+Specifies optional flags to feed into the createrepo tool, which is called when "cobbler reposync" is run for the
+given repository.  The defaults are '-c cache'.
+
 =back
 
 =head2 DISPLAYING CONFIGURATION ENTRIES