[Lsb-messages] /var/www/bzr/lsb/4.0/misc-test r2087: backport cmdchk change to use new Command appear/withdraw (bug 3510)
Mats Wichmann
mats at linuxfoundation.org
Thu May 24 12:12:49 UTC 2012
------------------------------------------------------------
revno: 2087
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Thu 2012-05-24 06:12:49 -0600
message:
backport cmdchk change to use new Command appear/withdraw (bug 3510)
modified:
cmdchk/cmdlist
cmdchk/cmds.h
cmdchk/mkcmdlist
cmdchk/mkcmdlist2
-------------- next part --------------
=== modified file 'cmdchk/cmdlist'
--- a/cmdchk/cmdlist 2011-03-25 20:51:08 +0000
+++ b/cmdchk/cmdlist 2012-05-24 12:12:49 +0000
@@ -143,18 +143,11 @@
usermod /usr/sbin/usermod 1.0 NULL
wc None 1.0 NULL
xargs None 1.0 NULL
-xdg-desktop-icon None 3.2 4.1
-xdg-desktop-icon None 4.1 NULL
-xdg-desktop-menu None 3.2 4.1
-xdg-desktop-menu None 4.1 NULL
-xdg-email None 3.2 4.1
-xdg-email None 4.1 NULL
-xdg-icon-resource None 3.2 4.1
-xdg-icon-resource None 4.1 NULL
-xdg-mime None 3.2 4.1
-xdg-mime None 4.1 NULL
-xdg-open None 3.2 4.1
-xdg-open None 4.1 NULL
-xdg-screensaver None 3.2 4.1
-xdg-screensaver None 4.1 NULL
+xdg-desktop-icon None 3.2 NULL
+xdg-desktop-menu None 3.2 NULL
+xdg-email None 3.2 NULL
+xdg-icon-resource None 3.2 NULL
+xdg-mime None 3.2 NULL
+xdg-open None 3.2 NULL
+xdg-screensaver None 3.2 NULL
zcat /bin/zcat 3.2 NULL
=== modified file 'cmdchk/cmds.h'
--- a/cmdchk/cmds.h 2011-03-25 20:51:08 +0000
+++ b/cmdchk/cmds.h 2012-05-24 12:12:49 +0000
@@ -150,20 +150,13 @@
{"usermod", "/usr/sbin/usermod", 10, 0},
{"wc", "", 10, 0},
{"xargs", "", 10, 0},
- {"xdg-desktop-icon", "", 32, 41},
- {"xdg-desktop-icon", "", 41, 0},
- {"xdg-desktop-menu", "", 32, 41},
- {"xdg-desktop-menu", "", 41, 0},
- {"xdg-email", "", 32, 41},
- {"xdg-email", "", 41, 0},
- {"xdg-icon-resource", "", 32, 41},
- {"xdg-icon-resource", "", 41, 0},
- {"xdg-mime", "", 32, 41},
- {"xdg-mime", "", 41, 0},
- {"xdg-open", "", 32, 41},
- {"xdg-open", "", 41, 0},
- {"xdg-screensaver", "", 32, 41},
- {"xdg-screensaver", "", 41, 0},
+ {"xdg-desktop-icon", "", 32, 0},
+ {"xdg-desktop-menu", "", 32, 0},
+ {"xdg-email", "", 32, 0},
+ {"xdg-icon-resource", "", 32, 0},
+ {"xdg-mime", "", 32, 0},
+ {"xdg-open", "", 32, 0},
+ {"xdg-screensaver", "", 32, 0},
{"zcat", "/bin/zcat", 32, 0},
};
=== modified file 'cmdchk/mkcmdlist'
--- a/cmdchk/mkcmdlist 2011-03-25 20:51:08 +0000
+++ b/cmdchk/mkcmdlist 2012-05-24 12:12:49 +0000
@@ -31,11 +31,10 @@
# Note: place all commands to core_cmdlist,
# independently of actual specification module
-$select = "SELECT DISTINCT Cid,Cname,Cpath,SMCappearedin,SMCwithdrawnin FROM Command ";
-$select.= "LEFT JOIN SModCmd ON SMCcid=Cid ";
-$select.= "WHERE SMCappearedin > '' ";
+$select = "SELECT DISTINCT Cid,Cname,Cpath,Cappearedin,Cwithdrawnin FROM Command ";
+$select.= "WHERE Cappearedin > '' ";
$select.= "AND Cbuiltin!='Yes' ";
-$select.= "ORDER BY Cname ";
+$select.= "ORDER BY Cname, Cappearedin ";
#print $select;
@@ -44,10 +43,10 @@
for(1..$sth->rows) {
$entry = $sth->fetchrow_hashref;
- $cmdappearedin = $entry->{'SMCappearedin'};
+ $cmdappearedin = $entry->{'Cappearedin'};
$cmdappearedin =~ s/\.//;
- if( $entry->{'SMCwithdrawnin'} ) {
- $cmdwithdrawnin = $entry->{'SMCwithdrawnin'};
+ if( $entry->{'Cwithdrawnin'} ) {
+ $cmdwithdrawnin = $entry->{'Cwithdrawnin'};
$cmdwithdrawnin =~ s/\.//;
}
else {
@@ -61,7 +60,7 @@
# Probably we'll want core/desktop separation in future,
# but currently we simply leave desktop_cmdlist empty
# requesting non-existent module id in the query below
-$select = "SELECT DISTINCT Cid,Cname,Cpath FROM Command ";
+$select = "SELECT DISTINCT Cid,Cname,Cpath,Cappearedin,Cwithdrawnin FROM Command ";
$select.= "LEFT JOIN SModCmd ON SMCcid=Cid ";
$select.= "WHERE SMCappearedin > '' ";
$select.= "AND Cbuiltin!='Yes' AND SMCsmid=9999 ";
@@ -74,10 +73,10 @@
for(1..$sth->rows) {
$entry = $sth->fetchrow_hashref;
- $cmdappearedin = $entry->{'SMCappearedin'};
+ $cmdappearedin = $entry->{'Cappearedin'};
$cmdappearedin =~ s/\.//;
- if( $entry->{'SMCwithdrawnin'} ) {
- $cmdwithdrawnin = $entry->{'SMCwithdrawnin'};
+ if( $entry->{'Cwithdrawnin'} ) {
+ $cmdwithdrawnin = $entry->{'Cwithdrawnin'};
$cmdwithdrawnin =~ s/\.//;
}
else {
=== modified file 'cmdchk/mkcmdlist2'
--- a/cmdchk/mkcmdlist2 2011-03-25 20:51:08 +0000
+++ b/cmdchk/mkcmdlist2 2012-05-24 12:12:49 +0000
@@ -30,11 +30,10 @@
print CMDS "# Generated file\n";
print CMDS "# List of LSB commands for the Python cmdchk\n";
-$select = "SELECT DISTINCT Cid,Cname,Cpath,SMCappearedin,SMCwithdrawnin FROM Command ";
-$select.= "LEFT JOIN SModCmd ON SMCcid=Cid ";
-$select.= "WHERE SMCappearedin > '' ";
+$select = "SELECT DISTINCT Cid,Cname,Cpath,Cappearedin,Cwithdrawnin FROM Command ";
+$select.= "WHERE Cappearedin > '' ";
$select.= "AND Cbuiltin!='Yes' ";
-$select.= "ORDER BY Cname ";
+$select.= "ORDER BY Cname, Cappearedin ";
#print $select;
@@ -44,7 +43,7 @@
for(1..$sth->rows) {
$entry = $sth->fetchrow_hashref;
$cmdname=$entry->{'Cname'};
- $cmdappearedin=$entry->{'SMCappearedin'};
+ $cmdappearedin=$entry->{'Cappearedin'};
#$cmdappearedin =~ s/\.//;
if ($entry->{'Cpath'} eq "") {
$cmdpath='None';
@@ -52,10 +51,10 @@
$cmdpath=$entry->{'Cpath'};
}
- if (!$entry->{'SMCwithdrawnin'}) {
+ if (!$entry->{'Cwithdrawnin'}) {
$cmdwithdrawnin='NULL';
} else {
- $cmdwithdrawnin=$entry->{'SMCwithdrawnin'};
+ $cmdwithdrawnin=$entry->{'Cwithdrawnin'};
#$cmdwithdrawnin =~ s/\.//;
}
More information about the lsb-messages
mailing list