Changes to 'refs/tags/rhncfg-5.10.30-1'
by StephenHerr
Tag 'rhncfg-5.10.30-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-06-01 20:12 +0000
Tagging package [rhncfg] version [5.10.30-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-backend-1.8.29-1:
Jan Pazdziora (1):
The ip colum is numeric, do not cast parameter to string.
Michael Mraka (1):
extended to new koji taskinfo format
Milan Zazrivec (5):
811470 - new macro: array_desc
811470 - apidoc: use array_desc to remove empty list bullets
811470 - fix apidoc for activationkey.listActivatedSystems()
811470 - fix apidoc for channel.listPopularChannels()
811470 - fix apidoc for channel.access.setOrgSharing()
Stephen Herr (2):
824707 - rhncfg-actions should not log the diff of files that are not readable by all
Automatic commit of package [rhncfg] release [5.10.30-1].
---
client/tools/rhncfg/config_common/file_utils.py | 22 +++++--
client/tools/rhncfg/rhncfg.spec | 7 ++
java/buildconf/apidoc/docbook/macros.txt | 9 +++
java/buildconf/apidoc/html/macros.txt | 8 ++
java/buildconf/apidoc/jsp/macros.txt | 8 ++
java/buildconf/apidoc/singlepage/macros.txt | 8 ++
java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 30 ++++------
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/access/ChannelAccessHandler.java | 2
java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | 2
rel-eng/download-koji.sh | 4 +
rel-eng/packages/rhncfg | 2
12 files changed, 77 insertions(+), 27 deletions(-)
---
12 years
2 commits - client/tools rel-eng/packages
by StephenHerr
client/tools/rhncfg/config_common/file_utils.py | 22 +++++++++++++++++-----
client/tools/rhncfg/rhncfg.spec | 7 ++++++-
rel-eng/packages/rhncfg | 2 +-
3 files changed, 24 insertions(+), 7 deletions(-)
New commits:
commit edfb48a81cfc5e9fac29b25c7938c0d3241b4fa2
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jun 1 16:12:33 2012 -0400
Automatic commit of package [rhncfg] release [5.10.30-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 9cff0af..d539fe9 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.29
+Version: 5.10.30
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -102,6 +102,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Jun 01 2012 Stephen Herr <sherr(a)redhat.com> 5.10.30-1
+- 824707 - rhncfg-actions should not log the diff of files that are not
+ readable by all
+- %%defattr is not needed since rpm 4.4
+
* Mon May 14 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.10.29-1
- 820517 - fixed command synopsis
- 805449 - honor rhncfg-specific settings
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 99188fe..ad4c9f4 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.29-1 client/tools/rhncfg/
+5.10.30-1 client/tools/rhncfg/
commit 7a18b250b07ff4ed0c34fa48e69029c114ec3ab1
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jun 1 16:12:14 2012 -0400
824707 - rhncfg-actions should not log the diff of files that are not readable by all
diff --git a/client/tools/rhncfg/config_common/file_utils.py b/client/tools/rhncfg/config_common/file_utils.py
index 70563e6..f386403 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -14,6 +14,7 @@
#
import os
+import stat
import time
import tempfile
import base64
@@ -145,7 +146,8 @@ def diff(src, dst, srcname=None, dstname=None):
f = open(path, 'U')
content = f.readlines()
f.close()
- f_time = time.ctime(os.stat(path).st_mtime)
+ statinfo = os.stat(path)
+ f_time = time.ctime(statinfo.st_mtime)
if content and content[-1] and content[-1][-1] != "\n":
content[-1] += "\n"
else:
@@ -153,15 +155,25 @@ def diff(src, dst, srcname=None, dstname=None):
f_time = time.ctime(0)
if not name:
name = path
- return (content, name, f_time)
+ return (content, name, f_time, statinfo)
- (src_content, src_name, src_time) = f_content(src, srcname)
- (dst_content, dst_name, dst_time) = f_content(dst, dstname)
+ (src_content, src_name, src_time, src_stat) = f_content(src, srcname)
+ (dst_content, dst_name, dst_time, dst_stat) = f_content(dst, dstname)
diff_u = difflib.unified_diff(src_content, dst_content,
src_name, dst_name,
src_time, dst_time)
- return list(diff_u)
+
+ ret_list = list(diff_u)
+ # don't return the diff if the file is not readable by everyone
+ # for security reasons.
+ if (len(ret_list) > 0 # if differences exist
+ and src_stat.st_uid == 0 # and file is owned by root
+ and not src_stat.st_mode & stat.S_IROTH): #and not readable by all
+ ret_list = [
+ "Differences exist in a file that is not readable by all. ",
+ "Re-deployment of configuration file is recommended."]
+ return ret_list
12 years
3 commits - java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 10 ++++++----
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java | 2 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/access/ChannelAccessHandler.java | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 249d6e260f8e4d4a338f39acd7c6440d211baf39
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 1 20:04:58 2012 +0200
811470 - fix apidoc for channel.access.setOrgSharing()
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/access/ChannelAccessHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/access/ChannelAccessHandler.java
index 3bcc7dd..1eb9d7d 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/access/ChannelAccessHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/access/ChannelAccessHandler.java
@@ -109,7 +109,7 @@ public class ChannelAccessHandler extends BaseHandler {
* @xmlrpc.doc Set organization sharing access control.
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "channelLabel", "label of the channel")
- * @xmlrpc.param #prop_desc("string", "access", "Access (one of the
+ * @xmlrpc.param #param_desc("string", "access", "Access (one of the
* following: 'public', 'private', or 'protected'")
* @xmlrpc.returntype #return_int_success()
*/
commit c4d0305842961ebe1e8182d814965e87267f5023
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 1 20:03:26 2012 +0200
811470 - fix apidoc for channel.listPopularChannels()
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java
index ae99591..16e9d62 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java
@@ -168,7 +168,7 @@ public class ChannelHandler extends BaseHandler {
* the number of systems subscribed as specified by the popularity count will be
* returned.
* @xmlrpc.param #session_key()
- * @xmlrpc.param #prop("int", "popularityCount")
+ * @xmlrpc.param #param("int", "popularityCount")
* @xmlrpc.returntype
* #array()
* $ChannelTreeNodeSerializer
commit c6d6cca008000a92877079d6a322a9aa57cbcb7c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 1 19:59:13 2012 +0200
811470 - fix apidoc for activationkey.listActivatedSystems()
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
index 620049c..d947ca6 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
@@ -827,10 +827,12 @@ public class ActivationKeyHandler extends BaseHandler {
* @xmlrpc.param #param("string", "key")
* @xmlrpc.returntype
* #array()
- * #prop_desc("int", "id", "System id")
- * #prop("string", "hostname")
- * #prop_desc("dateTime.iso8601", "last_checkin", "Last time server
- * successfully checked in")
+ * #struct("system structure")
+ * #prop_desc("int", "id", "System id")
+ * #prop("string", "hostname")
+ * #prop_desc("dateTime.iso8601", "last_checkin", "Last time server
+ * successfully checked in")
+ * #struct_end()
* #array_end()
*/
public Object[] listActivatedSystems(String sessionKey, String key) {
12 years
2 commits - java/buildconf java/code
by Milan Zazrivec
java/buildconf/apidoc/docbook/macros.txt | 9 ++++
java/buildconf/apidoc/html/macros.txt | 8 ++++
java/buildconf/apidoc/jsp/macros.txt | 8 ++++
java/buildconf/apidoc/singlepage/macros.txt | 8 ++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 20 ++++------
5 files changed, 41 insertions(+), 12 deletions(-)
New commits:
commit bdf70d4f2adae79682013c26650c17f73a9b61b8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 1 19:46:49 2012 +0200
811470 - apidoc: use array_desc to remove empty list bullets
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
index e8ef194..620049c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
@@ -111,15 +111,14 @@ public class ActivationKeyHandler extends BaseHandler {
* default.")
* @xmlrpc.param #param_desc("int", "usageLimit", "If unlimited usage is desired,
* use the create API that does not include the parameter.")
- * @xmlrpc.param #array()
- * #item_desc("string", "Add-on entitlement label to associate with the key.")
+ * @xmlrpc.param #array_desc("string", "Add-on entitlement label to associate with the key.")
* #options()
* #item("monitoring_entitled")
* #item("provisioning_entitled")
* #item("virtualization_host")
* #item("virtualization_host_platform")
* #options_end()
- * #array_end()
+ * #array_desc_end()
* @xmlrpc.param #param("boolean", "universalDefault")
* @xmlrpc.returntype string - The new activation key.
*/
@@ -221,15 +220,14 @@ public class ActivationKeyHandler extends BaseHandler {
* @xmlrpc.param #param("string", "description")
* @xmlrpc.param #param_desc("string", "baseChannelLabel", "Leave empty to accept
* default.")
- * @xmlrpc.param #array()
- * #item_desc("string", "Add-on entitlement label to associate with the key.")
+ * @xmlrpc.param #array_desc("string", "Add-on entitlement label to associate with the key.")
* #options()
* #item("monitoring_entitled")
* #item("provisioning_entitled")
* #item("virtualization_host")
* #item("virtualization_host_platform")
* #options_end()
- * #array_end()
+ * #array_desc_end()
* @xmlrpc.param #param("boolean", "universalDefault")
* @xmlrpc.returntype string - The new activation key.
*/
@@ -388,15 +386,14 @@ public class ActivationKeyHandler extends BaseHandler {
* virtualization_host, virtualization_host_platform)
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("string", "key")
- * @xmlrpc.param #array()
- * #item_desc("string", "entitlement label")
+ * @xmlrpc.param #array_desc("string", "entitlement label")
* #options()
* #item("monitoring_entitled")
* #item("provisioning_entitled")
* #item("virtualization_host")
* #item("virtualization_host_platform")
* #options_end()
- * #array_end()
+ * #array_desc_end()
* @xmlrpc.returntype #return_int_success()
*/
public int addEntitlements(String sessionKey, String key, List entitlements) {
@@ -422,15 +419,14 @@ public class ActivationKeyHandler extends BaseHandler {
* provisioning_entitled, virtualization_host, virtualization_host_platform)
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("string", "key")
- * @xmlrpc.param #array()
- * #item_desc("string", "entitlement label")
+ * @xmlrpc.param #array_desc("string", "entitlement label")
* #options()
* #item("monitoring_entitled")
* #item("provisioning_entitled")
* #item("virtualization_host")
* #item("virtualization_host_platform")
* #options_end()
- * #array_end()
+ * #array_desc_end()
* @xmlrpc.returntype #return_int_success()
*/
public int removeEntitlements(String sessionKey, String key, List entitlements) {
commit 16e3c9cf4b8bb1733c887ccd75e7f31711bffff9
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 1 19:14:35 2012 +0200
811470 - new macro: array_desc
Used to denote an array parameter, its type and description.
diff --git a/java/buildconf/apidoc/docbook/macros.txt b/java/buildconf/apidoc/docbook/macros.txt
index f5ff91c..644b909 100644
--- a/java/buildconf/apidoc/docbook/macros.txt
+++ b/java/buildconf/apidoc/docbook/macros.txt
@@ -50,6 +50,15 @@
</itemizedlist>
</listitem>
#end
+#macro(array_desc $type $desc)
+<listitem>
+ <para>array $type - $desc</para>
+ <itemizedlist spacing="compact">
+#end
+#macro(array_desc_end)
+ </itemizedlist>
+</listitem>
+#end
#macro(array_single $type $desc)
<listitem>
<para>array:</para>
diff --git a/java/buildconf/apidoc/html/macros.txt b/java/buildconf/apidoc/html/macros.txt
index f7a70d2..ce797c4 100644
--- a/java/buildconf/apidoc/html/macros.txt
+++ b/java/buildconf/apidoc/html/macros.txt
@@ -47,6 +47,14 @@ array:
#macro(array_end)
</li></ul>
#end
+#macro(array_desc $type $desc)
+array:
+ <ul>
+ <li>$type - $desc
+#end
+#macro(array_desc_end)
+</li></ul>
+#end
#macro(array_single $type $desc)
array:
<ul>
diff --git a/java/buildconf/apidoc/jsp/macros.txt b/java/buildconf/apidoc/jsp/macros.txt
index f7a70d2..ce797c4 100644
--- a/java/buildconf/apidoc/jsp/macros.txt
+++ b/java/buildconf/apidoc/jsp/macros.txt
@@ -47,6 +47,14 @@ array:
#macro(array_end)
</li></ul>
#end
+#macro(array_desc $type $desc)
+array:
+ <ul>
+ <li>$type - $desc
+#end
+#macro(array_desc_end)
+</li></ul>
+#end
#macro(array_single $type $desc)
array:
<ul>
diff --git a/java/buildconf/apidoc/singlepage/macros.txt b/java/buildconf/apidoc/singlepage/macros.txt
index f7a70d2..ce797c4 100644
--- a/java/buildconf/apidoc/singlepage/macros.txt
+++ b/java/buildconf/apidoc/singlepage/macros.txt
@@ -47,6 +47,14 @@ array:
#macro(array_end)
</li></ul>
#end
+#macro(array_desc $type $desc)
+array:
+ <ul>
+ <li>$type - $desc
+#end
+#macro(array_desc_end)
+</li></ul>
+#end
#macro(array_single $type $desc)
array:
<ul>
12 years
rel-eng/download-koji.sh
by Michael Mraka
rel-eng/download-koji.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 7752e9faa2f555f0f8579d350bf9f2b19e53fc35
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 1 10:48:22 2012 +0200
extended to new koji taskinfo format
diff --git a/rel-eng/download-koji.sh b/rel-eng/download-koji.sh
index 3de7d2c..6c81d9b 100755
--- a/rel-eng/download-koji.sh
+++ b/rel-eng/download-koji.sh
@@ -10,5 +10,7 @@ $WGET -O - $1 \
/>download</ && ! /src\.rpm/ {
print $4 " -O " basename($4)}
/"getfile?.*\.rpm"/ && ! /src\.rpm/ {
- print "'"$KOJI"'" $2 " -O " basename($2)} ' \
+ print "'"$KOJI"'" $2 " -O " basename($2)}
+ /"http:\/\/download.*\.rpm/ && ! /src\.rpm/ {
+ print $2 " -O " basename($2)} ' \
| xargs -n 3 $WGET
12 years
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4e660db94772535d1566eec55ac27151c0df68a1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jun 1 10:48:02 2012 +0200
The ip colum is numeric, do not cast parameter to string.
Addressing
2012-05-29 10:23:02,506 [TP-Processor3] ERROR com.redhat.rhn.common.db.datasource.CachedStatement - Error while processing cached statement sql: SELECT KSIPR.kickstart_id AS i
FROM rhnKickstartIPRange KSIPR, rhnKSData KS
WHERE KSIPR.org_id = ?
AND KSIPR.min <= ?
AND KSIPR.max >= ?
AND KS.id = KSIPR.kickstart_id
ORDER BY KSIPR.min
com.redhat.rhn.common.db.WrappedSQLException: ERROR: operator does not exist: numeric <= character varying
Hint: No operator matches the given name and argument type(s). You might need to add explicit type casts.
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
index 2bdab17..a634b01 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java
@@ -198,7 +198,7 @@ public class KickstartManager extends BaseManager {
"org_ks_ip_ranges_for_ip");
Map params = new HashMap();
params.put("org_id", orgIn.getId());
- params.put("ip", clientIpIn.getLongNumber().toString());
+ params.put("ip", clientIpIn.getLongNumber());
ipRanges = mode.execute(params);
IpAddressRange bestRange = null;
12 years
Changes to 'refs/tags/spacewalk-backend-1.8.29-1'
by Michael Mraka
Tag 'spacewalk-backend-1.8.29-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-06-01 06:16 +0000
Tagging package [spacewalk-backend] version [1.8.29-1] in directory [backend/].
Changes since spacecmd-1.8.9-1:
Michael Mraka (2):
print reasonable error message when something wron with repo
Automatic commit of package [spacewalk-backend] release [1.8.29-1].
---
backend/satellite_tools/repo_plugins/yum_src.py | 6 +++++-
backend/satellite_tools/reposync.py | 12 ++++++++----
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 18 insertions(+), 7 deletions(-)
---
12 years
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ebd54d1b1fb5a4ef661e6fd8d2acd5b7db1d121b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 1 08:16:59 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.29-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c54e05c..b8f4101 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.8.28
+Version: 1.8.29
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -655,6 +655,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Jun 01 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.29-1
+- print reasonable error message when something wrong with repo
+
* Tue May 22 2012 Jan Pazdziora 1.8.28-1
- decode unicode string on IDN machines
- %%defattr is not needed since rpm 4.4
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 4235a16..093b05a 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.28-1 backend/
+1.8.29-1 backend/
12 years
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/repo_plugins/yum_src.py | 6 +++++-
backend/satellite_tools/reposync.py | 12 ++++++++----
2 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit ba4affa469cc027f3ba324d5830033aaffe4a2bf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 31 19:38:59 2012 +0200
print reasonable error message when something wron with repo
fixing
Traceback (most recent call last):
File "/usr/bin/spacewalk-repo-sync", line 100, in <module>
sys.exit(abs(main() or 0))
File "/usr/bin/spacewalk-repo-sync", line 93, in main
sync.sync()
File "/usr/lib/python2.6/site-packages/spacewalk/satellite_tools/reposync.py",
line 100, in sync
self.import_packages(plugin, repo_id, url)
File "/usr/lib/python2.6/site-packages/spacewalk/satellite_tools/reposync.py",
line 303, in import_packages
packages = plug.list_packages(filters)
File "/usr/lib/python2.6/site-packages/spacewalk/satellite_tools/repo_plugins/
yum_src.py", line 151, in list_packages
self.sack.populate(self.repo, 'metadata', None, 0)
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 164, in populate
if self._check_db_version(repo, mydbtype):
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 222, in _check_db
_version
return repo._check_db_version(mdtype)
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 1263, in _check_d
b_version
repoXML = self.repoXML
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 1462, in <lambda>
repoXML = property(fget=lambda self: self._getRepoXML(),
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 1458, in _getRepo
XML
raise Errors.RepoError, msg
yum.Errors.RepoError: Cannot retrieve repository metadata (repomd.xml) for
repository: centos6-x86_64. Please verify its path and try again
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index 3028a7c..64f0c01 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -141,7 +141,11 @@ class ContentSource(object):
warnings = YumWarnings()
warnings.disable()
- repo.baseurlSetup()
+ try:
+ repo.baseurlSetup()
+ except:
+ warnings.restore()
+ raise
warnings.restore()
repo.setup(False)
self.sack = self.repo.getPackageSack()
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 8396c1a..be86415 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -96,9 +96,14 @@ class RepoSync(object):
"""Trigger a reposync"""
start_time = datetime.now()
for (repo_id, url) in self.urls:
- plugin = self.repo_plugin(url, self.channel_label)
- self.import_packages(plugin, repo_id, url)
- self.import_updates(plugin, url)
+ self.print_msg("Repo URL: %s" % url)
+ try:
+ plugin = self.repo_plugin(url, self.channel_label)
+ self.import_packages(plugin, repo_id, url)
+ self.import_updates(plugin, url)
+ except Exception, e:
+ self.error_msg("ERROR: %s" % e.value)
+ continue
if self.regen:
taskomatic.add_to_repodata_queue_for_channel_package_subscription(
[self.channel_label], [], "server.app.yumreposync")
@@ -305,7 +310,6 @@ class RepoSync(object):
packages = plug.list_packages(filters)
to_process = []
num_passed = len(packages)
- self.print_msg("Repo URL: %s" % url)
self.print_msg("Packages in repo: %5d" % plug.num_packages)
if plug.num_excluded:
self.print_msg("Packages passed filter rules: %5d" % num_passed)
12 years