backend/satellite_tools/repo_plugins/yum_src.py | 8 ++++++++
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit c2ed72f19ea75b517633f8d3de10db831b7ca1ae
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 25 16:30:44 2013 +0200
Automatic commit of package [spacewalk-backend] release [2.1.1-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4516d76..9007251 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.0
+Version: 2.1.1
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -639,6 +639,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Jul 25 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.1-1
+- 803837 - process includepkgs and exclude from yum.conf
+
* Thu Jul 18 2013 Jan Dobes 2.0.3-1
- 645435 - log per channel instead of session
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 2c71c3a..6346bd8 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.0.3-1 backend/
+2.1.1-1 backend/
commit 439593537cc9a1afa5e3f8b8877c3b124423b406
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 25 16:26:14 2013 +0200
803837 - process includepkgs and exclude from yum.conf
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py
b/backend/satellite_tools/repo_plugins/yum_src.py
index 3658289..e4244e6 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -159,6 +159,14 @@ class ContentSource(object):
self.sack.populate(self.repo, 'metadata', None, 0)
pkglist = self.sack.returnPackages()
self.num_packages = len(pkglist)
+
+ if not filters:
+ # if there's no include/exclude filter on command line or in database
+ for p in self.repo.includepkgs:
+ filters.append(('+',[filter_conf]))
+ for p in self.repo.exclude:
+ filters.append(('-',[filter_conf]))
+
if filters:
pkglist = self._filter_packages(pkglist, filters)
pkglist = self._get_package_dependencies(self.sack, pkglist)