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

equal deleted inserted replaced

-:265a1d6b86bd
+:cc598d70bbbe
 import pkg.client.query_parser as query_p
 import pkg.fmri as fmri
 import pkg.misc as misc
 import pkg.p5i as p5i
 import pkg.search_errors as search_errors
-import pkg.variant as variant
 import pkg.nrlock
 from pkg.client.imageplan import EXECUTED_OK
 from pkg.client import global_settings
-CURRENT_API_VERSION = 23
+CURRENT_API_VERSION = 24
 CURRENT_P5I_VERSION = 1
 logger = global_settings.logger
 class ImageInterface(object):
 callbacks. cancel_state_callable is a function which the client
 wishes to have called each time whether the operation can be
 canceled changes. It can raise VersionException and
 ImageNotFoundException."""
-compatible_versions = set([23])
+compatible_versions = set([CURRENT_API_VERSION])
 if version_id not in compatible_versions:
 raise api_errors.VersionException(CURRENT_API_VERSION,
 version_id)
 self.log_operation_end(error=exc_value)
 self.__reset_unlock()
 self.__activity_lock.release()
 raise
+def plan_install(self, pkg_list, refresh_catalogs=True,
-def plan_install(self, pkg_list, filters, refresh_catalogs=True,
 noexecute=False, verbose=False, update_index=True):
 """Contructs a plan to install the packages provided in
-pkg_list.  pkg_list is a list of packages to install.  filters
+pkg_list.  pkg_list is a list of packages to install.
-is a list of filters to apply to the actions of the installed
+refresh_catalogs controls whether the catalogs will
-packages.  refresh_catalogs controls whether the catalogs will
 automatically be refreshed. noexecute determines whether the
 history will be recorded after planning is finished.  verbose
 controls whether verbose debugging output will be printed to the
 terminal.  Its existence is temporary.  It returns a boolean
 which tells the client whether there is anything to do.  It can
 self.__refresh_publishers()
 self.__img.make_install_plan(pkg_list,
 self.__progresstracker,
 self.__check_cancelation, noexecute,
-filters=filters, verbose=verbose)
+verbose=verbose)
 assert self.__img.imageplan
 if self.__canceling:
 raise api_errors.CanceledException()
 except api_errors.ImageNotFoundException:
 # Can't do anything in this
 # case; so proceed.
 pass
-# XXX For now, strip the publisher prefix from FMRIs for
+self.__img.make_update_plan(self.__progresstracker,
-# packages that were installed from a publisher that was
+self.__check_cancelation, noexecute,
-# preferred at the time of installation.  However, when
+verbose=verbose)
-# the image starts using prioritised publishers, this
-# will have to be removed.  Newer versions of packages
-# should only be a valid match if offered the same
-# publisher since equivalence cannot be determined by
-# package name alone.
-ppub = self.__img.get_preferred_publisher()
-pkg_list = [
-p.get_pkg_stem(anarchy=self.__img.is_pkg_preferred(
-p))
-for p in self.__img.gen_installed_pkgs()
-]
-self.__img.make_install_plan(pkg_list,
-self.__progresstracker, self.__check_cancelation,
-noexecute, verbose=verbose, multimatch_ignore=True)
 assert self.__img.imageplan
 if self.__canceling:
 raise api_errors.CanceledException()
 self.__set_can_be_canceled(False)
 self.__plan_common_finish()
 res = not self.__img.imageplan.nothingtodo()
 return res, opensolaris_image
-def plan_change_variant(self, variants, noexecute=False,
+def plan_change_varcets(self, variants=None, facets=None,
-verbose=False, be_name=None):
+noexecute=False, verbose=False, be_name=None):
-"""Creates a plan to change the specified variants on an image.
+"""Creates a plan to change the specified variants/facets on an image.
-There is option to refresh_catalogs since if we're changing
+verbose controls
-architectures, we have to download manifests that were
-previously uncached.  noexecute determines whether the history
-will be recorded after planning is finished.  verbose controls
 whether verbose debugging output will be printed to the
 terminal.  This function has two return values.  The first is
 a boolean which tells the client whether there is anything to
 do.  The third is either None, or an exception which indicates
 partial success.  This is currently used to indicate a failure
 in refreshing catalogs. It can raise CatalogRefreshException,
 IpkgOutOfDateException, NetworkUnavailableException,
 PlanCreationException and PermissionsException."""
 self.__plan_common_start("change-variant")
+if not variants and not facets:
+raise ValueError, "Nothing to do"
 try:
 self.check_be_name(be_name)
 self.be_name = be_name
 self.__refresh_publishers()
-self.__img.image_change_variant(variants,
+self.__img.image_change_varcets(variants,
+facets,
 self.__progresstracker,
 self.__check_cancelation,
 noexecute, verbose=verbose)
 assert self.__img.imageplan
 if self.__img.is_liveroot():
 e = api_errors.ImageUpdateOnLiveImageException()
 self.log_operation_end(error=e)
 raise e
 else:
-if self.__img.imageplan.actuators.reboot_needed() and \
+if self.__img.imageplan.reboot_needed() and \
 self.__img.is_liveroot():
 e = api_errors.RebootNeededOnLiveImageException()
 self.log_operation_end(error=e)
 raise e
 def __set_history_PlanCreationException(self, e):
 if e.unmatched_fmris or e.multiple_matches or \
 e.missing_matches or e.illegal:
 self.log_operation_end(error=e,
 result=history.RESULT_FAILED_BAD_REQUEST)
-elif e.constraint_violations:
-self.log_operation_end(error=e,
-result=history.RESULT_FAILED_CONSTRAINED)
 else:
 self.log_operation_end(error=e)
 def local_search(self, query_lst):
 """local_search takes a list of Query objects and performs
 get_manifest_path=\
 self.__img.get_manifest_path,
 gen_installed_pkg_names=\
 self.__img.gen_installed_pkg_names,
 case_sensitive=q.case_sensitive)
-excludes = [variant.Variants(
-{"variant.arch": self.__img.get_arch()}
-).allow_action]
 res = query.search(
 self.__img.gen_installed_pkgs,
-self.__img.get_manifest_path, excludes)
+self.__img.get_manifest_path,
+self.__img.list_excludes())
 except search_errors.InconsistentIndexException, e:
 raise api_errors.InconsistentIndexException(e)
 # i is being inserted to track which query the results
 # are for.  None is being inserted since there is no
 # publisher being searched against.
 self.__img.update_index_dir()
 self.log_operation_start("rebuild-index")
 if not os.path.isdir(self.__img.index_dir):
 self.__img.mkdirs()
 try:
-excludes = [variant.Variants(
-{"variant.arch": self.__img.get_arch()}).allow_action]
 ind = indexer.Indexer(self.__img, self.__img.get_manifest,
 self.__img.get_manifest_path,
-self.__progresstracker, excludes)
+self.__progresstracker, self.__img.list_excludes())
 ind.rebuild_index_from_scratch(
 self.__img.gen_installed_pkgs())
 except search_errors.ProblematicPermissionsIndexException, e:
 error = api_errors.ProblematicPermissionsIndexException(e)
 self.log_operation_end(error=error)
 self.__img.add_publisher(pub,
 refresh_allowed=refresh_allowed,
 progtrack=self.__progresstracker)
 finally:
 self.__img.cleanup_downloads()
+def get_pub_search_order(self):
+"""Return current search order of publishers; includes
+disabled publishers"""
+return self.__img.cfg_cache.publisher_search_order
+def set_pub_search_after(self, being_moved_prefix, staying_put_prefix):
+"""Change the publisher search order so that being_moved is
+searched after staying_put"""
+self.__img.pub_search_after(being_moved_prefix, staying_put_prefix)
+def set_pub_search_before(self, being_moved_prefix, staying_put_prefix):
+"""Change the publisher search order so that being_moved is
+searched before staying_put"""
+self.__img.pub_search_before(being_moved_prefix, staying_put_prefix)
 def get_preferred_publisher(self):
 """Returns the preferred publisher object for the image."""
 return self.get_publisher(
 prefix=self.__img.get_preferred_publisher())
 # Now remove the old publisher object using the
 # iterator key since the prefix might be
 # different for the new publisher object.
 updated = True
-del publishers[key]
+# only if prefix is different - this
+# preserves search order
+if key != pub.prefix:
+del publishers[key]
 # Prepare the new publisher object.
 pub.meta_root = \
 self.__img._get_publisher_meta_root(
 pub.prefix)

changeset 1505	cc598d70bbbe
parent 1504	265a1d6b86bd
child 1516	8c950a3b4171