diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2006-12-20 11:50:38 -0500 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-12-20 11:50:38 -0500 |
| commit | e59e6b77c871951ed6c71f8721ecf0f267bdc953 (patch) | |
| tree | 5e6fd99c1182a00553321f389aafff159a690ca6 /cobbler/action_reposync.py | |
| parent | 1a14dd6ad7a50cc2c4ecd594c5c0919ed60498ef (diff) | |
| download | third_party-cobbler-e59e6b77c871951ed6c71f8721ecf0f267bdc953.tar.gz third_party-cobbler-e59e6b77c871951ed6c71f8721ecf0f267bdc953.tar.xz third_party-cobbler-e59e6b77c871951ed6c71f8721ecf0f267bdc953.zip | |
Rsync mirrors shouldn't use SSH.
Diffstat (limited to 'cobbler/action_reposync.py')
| -rw-r--r-- | cobbler/action_reposync.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py index 97b6ee5..96d35f3 100644 --- a/cobbler/action_reposync.py +++ b/cobbler/action_reposync.py @@ -61,10 +61,7 @@ class RepoSync: except OSError, oe: if not oe.errno == 17: # already exists, constant for this? raise cexceptions.CobblerException("no_create", repo_path) - if mirror.startswith("rsync://") or mirror.startswith("ssh://"): - self.do_rsync_repo(repo) - else: - raise cexceptions.CobblerException("no_mirror") + self.do_rsync_repo(repo) return True @@ -75,7 +72,7 @@ class RepoSync: print "imagine an rsync happened here, and that it was amazing..." dest_path = os.path.join(self.settings.webdir, "repo_mirror", repo.name) spacer = "" - if repo.mirror.find("ssh://") != -1: + if repo.mirror.find("rsync://") != -1: spacer = "-e ssh" cmd = "rsync -av %s --delete --delete-excluded --exclude-from=/etc/cobbler/rsync.exclude %s %s" % (spacer, repo.mirror, dest_path) print "executing: %s" % cmd |