backend/satellite_tools/rhn_satellite_activate.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 45240b4bd4b9fdf6ba5b6ba000c84fdc59ff07b3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 1 10:13:16 2010 +0100
656294 - sync channels only from rhn_parent
diff --git a/backend/satellite_tools/rhn_satellite_activate.py
b/backend/satellite_tools/rhn_satellite_activate.py
index 00686f4..82e24fb 100644
--- a/backend/satellite_tools/rhn_satellite_activate.py
+++ b/backend/satellite_tools/rhn_satellite_activate.py
@@ -626,7 +626,7 @@ def main():
return 89
# channel family stuff
- if not options.disconnected:
+ if not options.disconnected and CFG.RHN_PARENT and not CFG.ISS_PARENT:
try:
populateChannelFamilies(options)
except PopulateChannelFamiliesException, e:
Show replies by date