summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--cobbler.spec3
-rw-r--r--cobbler/action_reposync.py1
3 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8b74ae0..b0aea12 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
Cobbler CHANGELOG
(all entries mdehaan@redhat.com unless noted otherwise)
-* Mon Dec 18 2006 - 0.3.5-1
+* Wed Dec 20 2006 - 0.3.5-1
- Fixed bug in cobbler import related to orphan detection
- Made default rsync.exclude more strict (OO langpacks and KDE translation)
- Now runs createrepo during "cobbler import" to build more correct repodata
diff --git a/cobbler.spec b/cobbler.spec
index 676345f..ba5935c 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -12,6 +12,7 @@ Requires: httpd
Requires: tftp-server
Requires: python-devel
Requires: createrepo
+BuildRequires: python-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
ExcludeArch: ppc
@@ -56,7 +57,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
-* Mon Dec 18 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.5-1
+* Wed Dec 20 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.5-1
- Upstream changes (see CHANGELOG)
- Added createrepo as Requires
diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py
index 2aeffd1..276dd71 100644
--- a/cobbler/action_reposync.py
+++ b/cobbler/action_reposync.py
@@ -81,7 +81,6 @@ class RepoSync:
arg = {}
print "- walking: %s" % dest_path
os.path.walk(dest_path, self.createrepo_walker, arg)
-
if repo.local_filename is not None and repo.local_filename != "":
# this is a rather primative configuration in terms of yum options, but allows
# for repos that were added with a value for --local-filename to provision a system