diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-03-17 17:56:34 +0100 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2015-04-14 19:25:47 +0200 |
| commit | cc19b5a76a37d1fb87deb45d9cbfc71472a99fa4 (patch) | |
| tree | 1dbecc1e9cb5b4bf972996fc45a2738f9942863d /ipaserver/install/plugins/update_idranges.py | |
| parent | b4ca5c57d230c80ecc4f8eaaa01d8e7a36bcb3b4 (diff) | |
| download | freeipa-cc19b5a76a37d1fb87deb45d9cbfc71472a99fa4.tar.gz freeipa-cc19b5a76a37d1fb87deb45d9cbfc71472a99fa4.tar.xz freeipa-cc19b5a76a37d1fb87deb45d9cbfc71472a99fa4.zip | |
Server Upgrade: Apply plugin updates immediately
Preparation to moving plugins executin into update files.
* remove apply_now flag
* plugins will return only (restart, modifications)
https://fedorahosted.org/freeipa/ticket/4904
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipaserver/install/plugins/update_idranges.py')
| -rw-r--r-- | ipaserver/install/plugins/update_idranges.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ipaserver/install/plugins/update_idranges.py b/ipaserver/install/plugins/update_idranges.py index 1aa5fa763..ff061bef7 100644 --- a/ipaserver/install/plugins/update_idranges.py +++ b/ipaserver/install/plugins/update_idranges.py @@ -51,18 +51,18 @@ class update_idrange_type(PostUpdate): except errors.NotFound: root_logger.debug("update_idrange_type: no ID range without " "type set found") - return (False, False, []) + return False, [] except errors.ExecutionError, e: root_logger.error("update_idrange_type: cannot retrieve list " "of ranges with no type set: %s", e) - return (False, False, []) + return False, [] if not entries: # No entry was returned, rather break than continue cycling root_logger.debug("update_idrange_type: no ID range was " "returned") - return (False, False, []) + return False, [] root_logger.debug("update_idrange_type: found %d " "idranges to update, truncated: %s", @@ -101,15 +101,15 @@ class update_idrange_type(PostUpdate): # Exit loop to avoid infinite cycles root_logger.error("update_idrange_type: error(s) " "detected during idrange type update") - return (False, False, []) + return False, [] elif not truncated: # All affected entries updated, exit the loop root_logger.debug("update_idrange_type: all affected idranges " "were assigned types") - return (False, False, []) + return False, [] - return (False, False, []) + return False, [] class update_idrange_baserid(PostUpdate): @@ -140,12 +140,12 @@ class update_idrange_baserid(PostUpdate): except errors.NotFound: root_logger.debug("update_idrange_baserid: no AD domain " "range with posix attributes found") - return (False, False, []) + return False, [] except errors.ExecutionError, e: root_logger.error("update_idrange_baserid: cannot retrieve " "list of affected ranges: %s", e) - return (False, False, []) + return False, [] root_logger.debug("update_idrange_baserid: found %d " "idranges possible to update", @@ -175,7 +175,7 @@ class update_idrange_baserid(PostUpdate): root_logger.debug("update_idrange_baserid: all affected " "idranges updated") - return (False, False, []) + return False, [] api.register(update_idrange_type) api.register(update_idrange_baserid) |