diff options
author | Michael DeHaan <mdehaan@redhat.com> | 2007-02-16 15:26:03 -0500 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2007-02-16 15:26:03 -0500 |
commit | 102483e058ecffd07641482758b652ae540f5f7f (patch) | |
tree | 70a2c6b53005e3127ad9ac492b322878b91d0285 /cobbler | |
parent | c60f8e15d134f9207e4ba5a6a7c32f32263a98a7 (diff) | |
download | third_party-cobbler-102483e058ecffd07641482758b652ae540f5f7f.tar.gz third_party-cobbler-102483e058ecffd07641482758b652ae540f5f7f.tar.xz third_party-cobbler-102483e058ecffd07641482758b652ae540f5f7f.zip |
A few things
- manpage clarification/correction (including a parameter typo in "cobbler repo add")
- don't write the etc/yum.repos.d file if no --local-filename
- print out createrepo command for debug purposes (during cobbler import)
Diffstat (limited to 'cobbler')
-rw-r--r-- | cobbler/action_import.py | 1 | ||||
-rw-r--r-- | cobbler/action_sync.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cobbler/action_import.py b/cobbler/action_import.py index f61a85f..aad4756 100644 --- a/cobbler/action_import.py +++ b/cobbler/action_import.py @@ -222,6 +222,7 @@ class Importer: # they'll share same repo files. if not processed_repos.has_key(comps_path): cmd = "createrepo --groupfile %s %s" % (comps_file, comps_path) + print "- %s" % cmd sub_process.call(cmd,shell=True) print "- repository updated" processed_repos[comps_path] = 1 diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index ebf5a91..47e61ce 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -398,7 +398,7 @@ class BootSync: repo = self.repos.find(r) if repo is None: continue - if not (repo.local_filename is None and repo.local_filename != ""): + if not (repo.local_filename is None) or (repo.local_filename == ""): buf = buf + "wget http://%s/cobbler_track/repo_mirror/%s/config.repo --output-document=/etc/yum.repos.d/%s.repo\n" % (self.settings.server, repo.name, repo.local_filename) return buf |