--- a/doc/guide-naming-conventions.rst Thu Aug 30 15:56:36 2012 -0700
+++ b/doc/guide-naming-conventions.rst Fri Aug 31 14:50:29 2012 -0700
@@ -31,14 +31,14 @@
fault management architecture, each package is named by an FMRI in the
``pkg:`` scheme. That is, we have::
- pkg://authority/pkg_name@version
+ pkg://publisher/pkg_name@version
-The authority is generally expected to be a forward or reverse domain
+The publisher is generally expected to be a forward or reverse domain
name identifying the publisher from which a package can be retrieved.
-Authorities which cannot be determined to be a domain name are
+Publishers which cannot be determined to be a domain name are
legitimate, but optional functionality, like automatic server discovery
-for a particular authority, may fail to work. In the examples that
-follow, we use "opensolaris.org" as a generic authority.
+for a particular publisher, may fail to work. In the examples that
+follow, we use "opensolaris.org" as a generic publisher.
Although RFC 2396 usage would suggest using the "authority" term, we
instead call it the publisher name, as the role of this section of the
@@ -62,7 +62,7 @@
Namespace
~~~~~~~~~
-Single namespace, separate authorities
+Single namespace, separate publishers
``````````````````````````````````````
The primary design point of the package namespace is to allow
--- a/doc/pkgs-and-groups.txt Thu Aug 30 15:56:36 2012 -0700
+++ b/doc/pkgs-and-groups.txt Fri Aug 31 14:50:29 2012 -0700
@@ -10,15 +10,15 @@
fault management architecture, each package is named by an FMRI in
the "pkg:" scheme. That is, we have
- pkg://authority/pkg_name@version
+ pkg://publisher/pkg_name@version
- The authority is generally expected to be a forward or reverse
+ The publisher is generally expected to be a forward or reverse
domain name identifying the publisher from which a package can be
- retrieved. Authorities which cannot be determined to be a domain
+ retrieved. Publishers which cannot be determined to be a domain
name are legitimate, but optional functionality, like automatic
- server discovery for a particular authority, may fail to work.
+ server discovery for a particular publisher, may fail to work.
In the examples that follow, we use "opensolaris.org" as a generic
- authority.
+ publisher.
The pkg_name, like service names, can be split into a category,
subcategories, and a basename. This namespace might be populated
@@ -35,7 +35,7 @@
2. Namespace
-2.1. Single namespace, separate authorities
+2.1. Single namespace, separate publishers
The primary design point of the package namespace is to allow
multiple package producers to co-exist in a single namespace, so
--- a/src/client.py Thu Aug 30 15:56:36 2012 -0700
+++ b/src/client.py Fri Aug 31 14:50:29 2012 -0700
@@ -5710,14 +5710,13 @@
set_props = {}
version = None
- opts, pargs = getopt.getopt(args, "fFPUza:g:m:p:k:c:",
- ["force", "full", "partial", "user", "zone", "authority=", "facet=",
- "mirror=", "origin=", "publisher=", "no-refresh", "variant=",
+ opts, pargs = getopt.getopt(args, "fFPUzg:m:p:k:c:",
+ ["force", "full", "partial", "user", "zone", "facet=", "mirror=",
+ "origin=", "publisher=", "no-refresh", "variant=",
"set-property="])
for opt, arg in opts:
- # -a is deprecated and will be removed at a future date.
- if opt in ("-a", "-p", "--publisher"):
+ if opt in ("-p", "--publisher"):
pub_url = None
try:
pub_name, pub_url = arg.split("=", 1)
@@ -6278,7 +6277,6 @@
"attach-linked" : (attach_linked, opts_attach_linked, 2),
"avoid" : (avoid, None),
"audit-linked" : (audit_linked, opts_audit_linked),
- "authority" : (publisher_list, None),
"change-facet" : (change_facet, opts_install, -1),
"change-variant" : (change_variant, opts_install, -1),
"contents" : (list_contents, None),
@@ -6306,7 +6304,6 @@
"remove-property-value" : (property_remove_value, None),
"revert" : (revert, opts_revert, -1),
"search" : (search, None),
- "set-authority" : (publisher_set, None),
"set-mediator" : (set_mediator, opts_set_mediator, -1),
"set-property" : (property_set, None),
"set-property-linked" : (set_property_linked,
@@ -6316,7 +6313,6 @@
"unavoid" : (unavoid, None),
"unfreeze" : (unfreeze, None),
"uninstall" : (uninstall, opts_uninstall, -1),
- "unset-authority" : (publisher_unset, None),
"unset-property" : (property_unset, None),
"update-format" : (update_format, None),
"unset-mediator" : (unset_mediator, opts_unset_mediator, -1),
--- a/src/tests/cli/t_pkg_image_create.py Thu Aug 30 15:56:36 2012 -0700
+++ b/src/tests/cli/t_pkg_image_create.py Fri Aug 31 14:50:29 2012 -0700
@@ -225,7 +225,7 @@
information work as expected for image-create."""
img_path = os.path.join(self.test_root, "test_4_img")
- for opt in ("-a", "-p", "--publisher"):
+ for opt in ("-p", "--publisher"):
self.pkg("image-create %s test1=%s %s" % (opt,
self.rurl1, img_path))
shutil.rmtree(img_path)
--- a/src/tests/cli/t_pkg_publisher.py Thu Aug 30 15:56:36 2012 -0700
+++ b/src/tests/cli/t_pkg_publisher.py Fri Aug 31 14:50:29 2012 -0700
@@ -88,15 +88,6 @@
self.pkg("unset-publisher test1")
self.pkg("publisher | grep test1", exit=1)
- # Verify that compatibility commands for publisher work (only
- # minimal verification is needed since these commands map
- # directly to the publisher ones). All of these are deprecated
- # and will be removed at a future date.
- self.pkg("authority test2")
- self.pkg("set-authority --no-refresh -O http://%s2 test1" %
- self.bogus_url)
- self.pkg("unset-authority test1")
-
# Now verify that partial success (3) or complete failure (1)
# is properly returned if an attempt to remove one or more
# publishers only results in some of them being removed: