backend/satellite_tools/repo_plugins/yum_src.py | 9 ++++++---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 0e4e360e867ca37b5c5bdef4bd73f3be36186710
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Apr 5 15:06:17 2013 +0200
Automatic commit of package [spacewalk-backend] release [1.10.16-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 010b092..8c94d31 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: 1.10.15
+Version: 1.10.16
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Apr 05 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.16-1
+- 929238 - fixed local path for file:// repos
+- 918333 - reflect schema change
+
* Wed Mar 27 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.15-1
- abrt: check the package string is complete
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a87a36f..05795be 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.15-1 backend/
+1.10.16-1 backend/
commit 2b27e1ce58be1db588539d383953a4c31b3c06a9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Apr 5 14:48:09 2013 +0200
929238 - fixed local path for file:// repos
Fedora 18 has new yum which verifies downloaded packages via
package.verifyLocalPkg() and complains about wrong path.
fixing
1/10 : test-srsJ-0.1-1-0.noarch
Downloaded package test-srsJ-0.1-1.noarch, from
spacewalk-repo-sync-test-channel-17458, but it was invalid.
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py
b/backend/satellite_tools/repo_plugins/yum_src.py
index d7ff116..fef2a4e 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -127,9 +127,12 @@ class ContentSource(object):
# base_persistdir have to be set before pkgdir
if hasattr(repo, 'base_persistdir'):
repo.base_persistdir = CACHE_DIR
- pkgdir = os.path.join(CFG.MOUNT_POINT, CFG.PREPENDED_DIR, '1',
'stage')
- if not os.path.isdir(pkgdir):
- fileutils.makedirs(pkgdir, user='apache', group='apache')
+ if (self.url.find("file://") < 0):
+ pkgdir = os.path.join(CFG.MOUNT_POINT, CFG.PREPENDED_DIR, '1',
'stage')
+ if not os.path.isdir(pkgdir):
+ fileutils.makedirs(pkgdir, user='apache',
group='apache')
+ else:
+ pkgdir = self.url[7:]
repo.pkgdir = pkgdir
yb_cfg = self.yumbase.conf.cfg