diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2006-12-13 13:34:17 -0500 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-12-13 13:34:17 -0500 |
| commit | b7eabac3549b70fb5ce22b69b79b400affa98690 (patch) | |
| tree | 963460d4a7d469061b7c680e6feeebc3345603eb | |
| parent | 1531693df6fdd0441e30cb7949fabe07188d266e (diff) | |
| download | third_party-cobbler-b7eabac3549b70fb5ce22b69b79b400affa98690.tar.gz third_party-cobbler-b7eabac3549b70fb5ce22b69b79b400affa98690.tar.xz third_party-cobbler-b7eabac3549b70fb5ce22b69b79b400affa98690.zip | |
Fix update script, though replacing the update script with reposync (and generalized code)
seems to be the best route.
| -rw-r--r-- | cobbler/action_import.py | 6 | ||||
| -rw-r--r-- | rsync.exclude | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cobbler/action_import.py b/cobbler/action_import.py index 997391e..04bc6f5 100644 --- a/cobbler/action_import.py +++ b/cobbler/action_import.py @@ -100,10 +100,12 @@ class Importer: cmd = "rsync -a %s %s /var/www/cobbler/ks_mirror/%s --exclude-from=/etc/cobbler/rsync.exclude --delete --delete-excluded --progress" % (spacer, self.mirror, self.mirror_name) sub_process.call(cmd,shell=True) update_file = open(os.path.join(self.path,"update.sh"),"w+") - update_file.write("#!/bin/sh") + update_file.write("#!/bin/sh\n") update_file.write("%s\n" % cmd) # leave this commented out in the file because it will - # erase user customizations. + # erase user customizations ... it is needed to update the repodata, however. + # FIXME: cobbler reposync might want to take care of this and then update.sh would + # go away... update_file.write("#cobbler import --path=%s" % self.path) update_file.close() if self.path is not None: diff --git a/rsync.exclude b/rsync.exclude index 5d0731b..15ed695 100644 --- a/rsync.exclude +++ b/rsync.exclude @@ -6,6 +6,6 @@ **/ppc/** **/source/** **/iso/** -**/openoffice.org-langpack* -**/kde-i18n +**/openoffice.org-langpack** +**/kde-i18n** **/SPRMS/** |