upstream/oracle/pkg-gate: comparison src/client.py

equal deleted inserted replaced

-:00a5b4d54eb8
+:78ac66abc186
 from pkg.client.history import (RESULT_CANCELED, RESULT_FAILED_BAD_REQUEST,
 RESULT_FAILED_CONFIGURATION, RESULT_FAILED_TRANSPORT, RESULT_FAILED_UNKNOWN,
 RESULT_FAILED_OUTOFMEMORY)
 from pkg.misc import EmptyI, msg, PipeError
-CLIENT_API_VERSION = 25
+CLIENT_API_VERSION = 26
 PKG_CLIENT_NAME = "pkg"
 JUST_UNKNOWN = 0
 JUST_LEFT = -1
 JUST_RIGHT = 1
 # needed since the catalog may be out of date or
 # invalid as a result of publisher information
 # changing (such as an origin uri, etc.).
 try:
 api_inst.refresh()
-except KeyboardInterrupt:
+except api_errors.PermissionsException:
-raise
+# Ignore permission exceptions with the
+# assumption that an unprivileged user is
+# executing this command and that the
+# refresh doesn't matter.
+pass
+except api_errors.CatalogRefreshException, e:
+succeeded = display_catalog_failures(e,
+ignore_perms_failure=True)
+if succeeded != e.total:
+# If total number of publishers does
+# not match 'successful' number
+# refreshed, abort.
+return EXIT_OOPS
 except:
 # Ignore the above error and just use what
 # already exists.
 pass
 return EXIT_OOPS
 except api_errors.ImageUpdateOnLiveImageException:
 error(_("%s cannot be done on live image") % operation)
 return EXIT_NOTLIVE
 except api_errors.RebootNeededOnLiveImageException:
-error(_("Requested \"%s\" operation would affect files that cannot be "
+error(_("Requested \"%s\" operation would affect files that "
-"modified in live image.\n"
+"cannot be modified in live image.\n"
-"Please retry this operation on an alternate boot environment.") %
+"Please retry this operation on an alternate boot "
-operation)
+"environment.") % operation)
 return EXIT_NOTLIVE
 except api_errors.CorruptedIndexException, e:
 error(INCONSISTENT_INDEX_ERROR_MESSAGE)
 return EXIT_OOPS
 except api_errors.ProblematicPermissionsIndexException, e:
 return EXIT_OOPS
 except api_errors.WrapSuccessfulIndexingException:
 raise
 except api_errors.ActionExecutionError, e:
 if not raise_ActionExecutionError:
-return 1
+return EXIT_OOPS
 error(_("An unexpected error happened during " \
 "%s: %s") % (operation, e))
 raise
 except Exception, e:
 error(_("An unexpected error happened during " \
 for d in e[1]:
 logger.error("  %s" % d)
 return False
 if e_type == api_errors.CatalogRefreshException:
 if display_catalog_failures(e) != 0:
-raise RuntimeError("Catalog refresh failed during %s." %
+return False
-op)
 if noexecute:
 return True
 return False
 if issubclass(e_type, api_errors.BEException):
 error(_(e))
 return False
 if e_type in (api_errors.CertificateError,
 api_errors.PlanCreationException,
 api_errors.PermissionsException):
 # Prepend a newline because otherwise the exception will
 # be printed on the same line as the spinner.
 (op, name))
 variants[name] = value
 api_inst = __api_alloc(img, quiet)
 if api_inst == None:
-return 1
+return EXIT_OOPS
 try:
 stuff_to_do = api_inst.plan_change_varcets(variants, facets=None,
 noexecute=noexecute, verbose=verbose, be_name=be_name)
 except:
 stuff_to_do = api_inst.plan_change_varcets(variants=None,
 facets=facets, noexecute=noexecute, verbose=verbose,
 be_name=be_name)
 except:
 if not __api_plan_exception(op, noexecute=noexecute):
-return 1
+return EXIT_OOPS
 if not stuff_to_do:
 msg(_("Facet change has no effect on image"))
 return EXIT_NOP
 if noexecute:
 return EXIT_OK
 if not __api_prepare(op, api_inst, verbose=verbose):
-return 1
+return EXIT_OOPS
 ret_code = __api_execute_plan(op, api_inst)
 if ret_code == 0 and opensolaris_image:
 msg("\n" + "-" * 75)
 orig_arg = arg
 arg = "http://" + arg
 if not misc.valid_pub_url(arg):
 error(_("%s is not a valid "
 "server URL.") % orig_arg)
-return 1
+return EXIT_OOPS
 remote = True
 servers.append({"origin": arg})
 elif opt == "-I":
 case_sensitive = True
 if j != JUST_UNKNOWN:
 return j
 try:
 int(v)
 return JUST_RIGHT
-# attribute is non-numeric or is something like
-# a list.
 except (ValueError, TypeError):
+# attribute is non-numeric or is something like
+# a list.
 return JUST_LEFT
 def create_output_format(display_headers, widths, justs, line):
 """Produce a format string that can be used to display results.
 else:
 img.history.operation_result = history.RESULT_SUCCEEDED
 img.cleanup_downloads()
 return err
-def display_catalog_failures(cre):
+def display_catalog_failures(cre, ignore_perms_failure=False):
 total = cre.total
 succeeded = cre.succeeded
 txt = _("pkg: %s/%s catalogs successfully updated:") % (succeeded,
 total)
 if cre.failed:
 # This ensures that the text gets printed before the errors.
 logger.error(txt)
 else:
 msg(txt)
+for pub, err in cre.failed:
+if ignore_perms_failure and \
+not isinstance(err, api_errors.PermissionsException):
+# If any errors other than a permissions exception are
+# found, then don't ignore them.
+ignore_perms_failure = False
+break
+if cre.failed and ignore_perms_failure:
+# Consider those that failed to have succeeded and add them
+# to the actual successful total.
+return succeeded + len(cre.failed)
 for pub, err in cre.failed:
 if isinstance(err, urllib2.HTTPError):
 logger.error("   %s: %s - %s" % \
 (err.filename, err.code, err.msg))
 immediate=True, pubs=pargs)
 except api_errors.PublisherError, e:
 error(e)
 error(_("'pkg publisher' will show a list of publishers."))
 return EXIT_OOPS
-except (api_errors.PermissionsException), e:
+except api_errors.PermissionsException, e:
 # Prepend a newline because otherwise the exception will
 # be printed on the same line as the spinner.
 error("\n" + str(e))
 return EXIT_OOPS
 except api_errors.CatalogRefreshException, e:
 ssl_cert = uri.ssl_cert
 if ssl_key is None:
 ssl_key = uri.ssl_key
 break
-origin = repo.reset_origins()
+repo.reset_origins()
 repo.add_origin(origin_url)
 # XXX once image configuration supports storing this
 # information at the uri level, ssl info should be set
 # here.
 logger.error("\n")
 error(_("cannot create image at %(image_dir)s: %(reason)s") %
 { "image_dir": image_dir, "reason": e.args[1] },
 cmd="image-create")
 return EXIT_OOPS
 except api_errors.PublisherError, e:
 error(e, cmd="image-create")
 return EXIT_OOPS
 except api_errors.PermissionsException, e:
 # Ensure messages are displayed after the spinner.
 img.cleanup_downloads()
 logger.error("")
 error(e, cmd="image-create")

changeset 1538	78ac66abc186
parent 1537	00a5b4d54eb8
child 1543	223040b72119