[Lsb-messages] /var/www/bzr/lsb/devel/lsbspec r4068: fiddle the wording on module query (bug 3949)

Mats Wichmann mats at linuxfoundation.org
Thu Mar 12 15:46:12 UTC 2015


------------------------------------------------------------
revno: 4068
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: lsbspec
timestamp: Thu 2015-03-12 09:46:12 -0600
message:
  fiddle the wording on module query (bug 3949)
modified:
  Common/generic/intro.m4
  Common/generic/intro.sgml
  mkcmdtable
-------------- next part --------------
=== modified file 'Common/generic/intro.m4'
--- a/Common/generic/intro.m4	2015-02-16 21:39:50 +0000
+++ b/Common/generic/intro.m4	2015-03-12 15:46:12 +0000
@@ -123,10 +123,23 @@
 </listitem>
 <listitem>
 <para>
-The implementation shall report its support for each of the modules
-constituting this specification, with the exception of the Trial Use module. 
-At minimum, this reporting shall be performed using the lsb_release command
-from the LSB Core Specification.
+The implementation shall report whether supports for each of the 
+modules constituting this specification is currently available,
+with the exception of the Trial Use module, which need not be reported.
+At a minimum, this reporting shall be performed using the
+<command>lsb_release</command> command
+described in the LSB Core module specification.
+<note>
+<title>Rationale</title>
+<para>
+An implementation must support all modules described as mandatory
+in this specification.  However, excepting
+the LSB Core module, which is always required,
+the support for a module may not be installed or enabled. 
+The intent of this clause is to indicate a run-time query 
+mechanism to determine the status of module support.
+</para>
+</note>
 </para>
 </listitem>
 </itemizedlist>

=== modified file 'Common/generic/intro.sgml'
--- a/Common/generic/intro.sgml	2015-02-17 03:01:15 +0000
+++ b/Common/generic/intro.sgml	2015-03-12 15:46:12 +0000
@@ -784,10 +784,23 @@
 </listitem>
 <listitem>
 <para>
-The implementation shall report its support for each of the modules
-constituting this specification, with the exception of the Trial Use module. 
-At minimum, this reporting shall be performed using the lsb_release command
-from the LSB Core Specification.
+The implementation shall report whether supports for each of the 
+modules constituting this specification is currently available,
+with the exception of the Trial Use module, which need not be reported.
+At a minimum, this reporting shall be performed using the
+<command>lsb_release</command> command
+described in the LSB Core module specification.
+<note>
+<title>Rationale</title>
+<para>
+An implementation must support all modules described as mandatory
+in this specification.  However, excepting
+the LSB Core module, which is always required,
+the support for a module may not be installed or enabled. 
+The intent of this clause is to indicate a run-time query 
+mechanism to determine the status of module support.
+</para>
+</note>
 </para>
 </listitem>
 </itemizedlist>

=== modified file 'mkcmdtable'
--- a/mkcmdtable	2015-02-17 16:23:32 +0000
+++ b/mkcmdtable	2015-03-12 15:46:12 +0000
@@ -162,7 +162,7 @@
 	$sth = $dbh->prepare("SELECT DISTINCT Sfull, Sid, Sname FROM Standard,Command
                           LEFT JOIN SModCmd ON Command.Cid=SModCmd.SMCcid
                           LEFT JOIN CmdStd ON CScid=Cid
-                          WHERE SModCmd.SMCsmid IN ($moduleid)
+                          WHERE SModCmd.SMCsmid IN ($SMid)
                           AND Standard.Sid=CSsid
                           AND SMCappearedin > '' AND SMCappearedin<='$lsbversion'
                           AND (SMCwithdrawnin IS NULL OR SMCwithdrawnin>'$lsbversion')
@@ -201,7 +201,7 @@
 			    AND CSappearedin > '' AND CSappearedin<='$lsbversion'
 			    AND (CSwithdrawnin IS NULL OR CSwithdrawnin>'$lsbversion')
                             AND $builtinCheck
-                            AND SModCmd.SMCsmid IN ($moduleid)
+                            AND SModCmd.SMCsmid IN ($SMid)
                             ORDER BY Command.Cname");
 	$sth->execute;
 
@@ -310,22 +310,22 @@
 # We can get module id from Module Table. Commands list will be generated as per modules.
 GetOptions("b" => \$builtins,
            "q" => \$noboiler,
-           "m=s" => \$module,
+           "m=s" => \$submodule,
 	   "v=s" => \$lsbversion);
 
 lsbOpenDB;
 
-if(!$module) { 
-    $module='LSB_Base';
+if(!$submodule) { 
+    $submodule='LSB_Base';
 }
-$moduleid = "";
-foreach $mod (split /,/, $module) {
+$SMid = "";
+foreach $mod (split /,/, $submodule) {
 	($modid) = $dbh->selectrow_array("SELECT SMid FROM SubModule WHERE SMname='$mod'");
 	die("Incorrect SubModule name: " . $mod) if not $modid;
-	if ($moduleid == "") {
-		$moduleid = $modid;
+	if ($SMid == "") {
+		$SMid = $modid;
 	} else {
-		$moduleid = $moduleid . "," . $modid;
+		$SMid = $SMid . "," . $modid;
 	}
 }
 



More information about the lsb-messages mailing list