backend/satellite_tools/repo_plugins/yum_src.py | 2 ++
backend/satellite_tools/satsync.py | 8 ++++----
client/rhel/yum-rhn-plugin/actions/packages.py | 3 ++-
3 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit bda7fe1181d1c4814d843e8116956782c1f0e330
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 7 10:55:29 2011 +0200
622490 - made output with no base channel look better
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 4ac19c9..972ed2f 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -745,14 +745,18 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
p_format = _(' %s %-40s %4s %s')
log(1, t_format % _('base-channels'))
# Relevant parent channels
+ no_base_channel = True
for plabel in pc_labels:
if plabel not in relevant:
continue
+ no_base_channel = False
timestamp = self._channel_collection.get_channel_timestamp(plabel)
channel_object = self._channel_collection.get_channel(plabel,
timestamp)
self._printChannel(plabel, channel_object, p_format, (plabel in ch_requested_imported))
+ if no_base_channel:
+ log(1, p_format % (' ', _('NONE RELEVANT'), '', ''))
# Relevant parent channels
for plabel in pc_labels:
commit e4b333bf9e52df89f74eea3ba7e517348e6d6c18
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 7 10:39:43 2011 +0200
622490 - even if parent channel isn't in dump there might be some child channels
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index cd73dfd..4ac19c9 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -756,9 +756,6 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
# Relevant parent channels
for plabel in pc_labels:
- if plabel not in relevant:
- continue
-
cchannels = self._channel_collection.get_child_channels(plabel)
# chns has only the channels we are interested in
# (and that's all the channels if we list them)
commit 0be4258f167d3f31b8b5a105e83285955844c034
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 7 10:38:38 2011 +0200
removed unused variable
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 08428bb..cd73dfd 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -759,7 +759,6 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
if plabel not in relevant:
continue
- timestamp = self._channel_collection.get_channel_timestamp(plabel)
cchannels = self._channel_collection.get_child_channels(plabel)
# chns has only the channels we are interested in
# (and that's all the channels if we list them)
commit 9cfb3bee94e703f39fe4267d7d3fa6c1dfad7f62
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Oct 6 09:43:00 2011 +0200
pass error messages from yum plugin to rhn_check
diff --git a/client/rhel/yum-rhn-plugin/actions/packages.py b/client/rhel/yum-rhn-plugin/actions/packages.py
index de1c3a6..332b2bc 100644
--- a/client/rhel/yum-rhn-plugin/actions/packages.py
+++ b/client/rhel/yum-rhn-plugin/actions/packages.py
@@ -19,6 +19,7 @@ import time
import yum
import yum.Errors
+from yum.plugins import PluginYumExit
sys.path.append("/usr/share/yum-cli")
@@ -476,7 +477,7 @@ def _run_yum_action(command, cache_only=None):
data["name"] = "failed_deps"
return (18, "Failed: packages requested raised "\
"dependency problems: %s" % str(e), data)
- except yum.Errors.YumBaseError, e:
+ except (yum.Errors.YumBaseError, PluginYumExit), e:
status = 6,
message = "Error while executing packages action: %s" % str(e)
data = {}
commit fa8107b2b84e4cd693ec21c587407a842db23f0d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 5 13:16:28 2011 +0200
don't create persistdir in cwd
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index 2d422ce..f0949da 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -99,6 +99,8 @@ class ContentSource:
repo.mirrorlist = url
repo.baseurl = [url]
repo.basecachedir = self.cache_dir
+ if hasattr(repo, 'base_persistdir'):
+ repo.base_persistdir = self.cache_dir
if self.proxy_url is not None:
repo.proxy = self.proxy_url