summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-08-28 14:01:34 -0400
committerMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-08-28 14:01:34 -0400
commit71c4ba479d6395e566a3517afdd4baafd5a3acb1 (patch)
tree901272bcde2b9d10b78c2947096000d8383cd131
parent8f5a8a3491599b22ff865fa884326afeff742b77 (diff)
downloadthird_party-cobbler-71c4ba479d6395e566a3517afdd4baafd5a3acb1.tar.gz
third_party-cobbler-71c4ba479d6395e566a3517afdd4baafd5a3acb1.tar.xz
third_party-cobbler-71c4ba479d6395e566a3517afdd4baafd5a3acb1.zip
Fix reposync if using rsync as a source and paths don't contain an arch
-rw-r--r--CHANGELOG3
-rw-r--r--cobbler/action_reposync.py3
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6ab38c9..c089492 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
Cobbler CHANGELOG
(all entries mdehaan@redhat.com unless noted otherwise)
-* Fri Aug 17 2007 - 0.6.1
+* Tue Aug 28 2007 - 0.6.1
- re enable --resolve in yumdownloader (cobbler repo mgmt feature)
- fix get_distros_for_koan API function in cobblerd (not used by koan)
- allow find API to search by arbitrary fields
@@ -15,6 +15,7 @@ Cobbler CHANGELOG
- tweaked domU sample kickstart to include wget
- added some more unit tests
- fix typo down one error path in cobbler sync.
+- fix reposync handling when using rsync protocol and directory paths do not contain arch
* Thu Aug 09 2007 - 0.6.0
- bugfix in error path in "cobbler check"
diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py
index 53cf4a3..8c7e242 100644
--- a/cobbler/action_reposync.py
+++ b/cobbler/action_reposync.py
@@ -240,8 +240,7 @@ class RepoSync:
"""
Used to run createrepo on a copied mirror.
"""
- target_dir = os.path.dirname(dirname).split("/")[-1]
- if target_dir.lower() in [ "i386", "x86_64", "ia64" ] or not repo.is_rsync_mirror():
+ if os.path.exists(os.path.join(dirname,"RPMS")) or not repo.is_rsync_mirror():
utils.remove_yum_olddata(dirname)
try:
cmd = "createrepo %s %s" % (repo.createrepo_flags, dirname)