Skip to main content

Source code Changes To

pkg-gate / src / modules / client / imageconfig.py

From revision 2903 to 2911:

diff -r c6743be48af1 -r 7c2ab5cbf6f9 src/modules/client/imageconfig.py
--- a/src/modules/client/imageconfig.py	Thu May 30 15:31:35 2013 -0700
+++ b/src/modules/client/imageconfig.py	Tue Jul 02 14:02:48 2013 +0100
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 import errno
@@ -1213,10 +1213,21 @@
                             prefix in img_cfg.publishers or \
                             prefix not in pubs_with_installed_pkgs:
                                 continue
+
+                        # only report this publisher as disabled if it wasn't
+                        # previously reported and saved as disabled.
+                        if not old_sysconfig.publishers[prefix].disabled:
+                                disabled_pubs |= set([prefix])
+
                         sys_cfg.publishers[prefix] = \
                             old_sysconfig.publishers[prefix]
                         sys_cfg.publishers[prefix].disabled = True
-                        disabled_pubs |= set([prefix])
+
+                        # if a syspub publisher is no longer available then
+                        # remove all the origin and mirror information
+                        # associated with that publisher.
+                        sys_cfg.publishers[prefix].repository.origins = []
+                        sys_cfg.publishers[prefix].repository.mirrors = []
 
                 # check if any system publisher have had origin changes.
                 modified_pubs = set()

 
 
Close
loading
Please Confirm
Close