The following commit has been merged in the master branch:
commit b76dbb70b0917eec63668eddc2f17bda4a2fc73e
Author: Guillem Jover <[email protected]>
Date: Mon Apr 1 03:44:29 2013 +0200
dpkg-statoverride: Refer to path instead of file
This clarifies the term removing the need to mention what file actually
refers to. And gets rid of a first person usage.
diff --git a/debian/changelog b/debian/changelog
index 7775a0a..d82edae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,7 @@ dpkg (1.17.0) UNRELEASED; urgency=low
* Mask fortify hardening option from dpkg-buildflags output on noopt.
New glibc 2.16 and later, issue a warning on this condition.
Closes: #691745
+ * Refer to path instead of file on dpkg-statoverride.
-- Guillem Jover <[email protected]> Fri, 03 Aug 2012 13:21:00 +0200
diff --git a/man/dpkg-statoverride.8 b/man/dpkg-statoverride.8
index 019ea27..a905fcc 100644
--- a/man/dpkg-statoverride.8
+++ b/man/dpkg-statoverride.8
@@ -1,7 +1,7 @@
.\" dpkg manual page - dpkg-statoverride(8)
.\"
.\" Copyright © 2000-2001 Wichert Akkerman <[email protected]>
-.\" Copyright © 2009-2011 Guillem Jover <[email protected]>
+.\" Copyright © 2009-2011, 2013 Guillem Jover <[email protected]>
.\"
.\" This is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
.
-.TH dpkg\-statoverride 8 "2011-07-04" "Debian project" "dpkg utilities"
+.TH dpkg\-statoverride 8 "2013-04-01" "Debian project" "dpkg utilities"
.SH NAME
dpkg\-statoverride \- override ownership and mode of files
.
@@ -28,8 +28,8 @@ dpkg\-statoverride \- override ownership and mode of files
`\fBstat overrides\fR' are a way to tell
.BR dpkg (1)
to use a different owner
-or mode for a file when a package is installed. (note: I use the word
-`file' here, but in reality this can be any filesystem object that
+or mode for a path when a package is installed (this applies to any
+filesystem object that
.B dpkg
handles, including directories, devices, etc.). This can be used to
force programs that are normally setuid to be install without a setuid
@@ -41,19 +41,19 @@ overrides.
.
.SH COMMANDS
.TP
-.BI \-\-add " user group mode file"
-Add an override for \fIfile\fP. \fIfile\fP does not need to exist
+.BI \-\-add " user group mode path"
+Add an override for \fIpath\fP. \fIpath\fP does not need to exist
when this command is used; the override will be stored and used later.
Users and groups can be specified by their name (for example \fBroot\fR
or \fBnobody\fR), or by their number by prepending the number with a
`\fB#\fR' (for example \fB#0\fR or \fB#65534\fR). The \fImode\fR needs
to be specified in octal.
-If \fB\-\-update\fP is specified and \fIfile\fP exists, it is immediately
+If \fB\-\-update\fP is specified and \fIpath\fP exists, it is immediately
set to the new owner and mode.
.TP
-.BI \-\-remove " file"
-Remove an override for \fIfile\fP, the status of \fIfile\fP is left
+.BI \-\-remove " path"
+Remove an override for \fIpath\fP, the status of \fIpath\fP is left
unchanged by this command.
.TP
.BR \-\-list " [\fIglob-pattern\fP]"
@@ -78,7 +78,7 @@ Force an action, even if a sanity check would otherwise
prohibit it.
This is necessary to override an existing override.
.TP
.B \-\-update
-Immediately try to change the file to the new owner and mode if it
+Immediately try to change the \fIpath\fP to the new owner and mode if it
exists.
.TP
.B \-\-quiet
diff --git a/src/statcmd.c b/src/statcmd.c
index 0d0bfe3..7b2b23c 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -75,16 +75,16 @@ usage(const struct cmdinfo *cip, const char *value)
printf(_(
"Commands:\n"
-" --add <owner> <group> <mode> <file>\n"
-" add a new entry into the database.\n"
-" --remove <file> remove file from the database.\n"
+" --add <owner> <group> <mode> <path>\n"
+" add a new <path> entry into the database.\n"
+" --remove <path> remove <path> from the database.\n"
" --list [<glob-pattern>] list current overrides in the database.\n"
"\n"));
printf(_(
"Options:\n"
" --admindir <directory> set the directory with the statoverride file.\n"
-" --update immediately update file permissions.\n"
+" --update immediately update <path> permissions.\n"
" --force force an action even if a sanity check fails.\n"
" --quiet quiet operation, minimal output.\n"
" --help show this help message.\n"
@@ -227,7 +227,7 @@ statoverride_add(const char *const *argv)
badusage(_("--%s needs four arguments"), cipaction->olong);
if (strchr(path, '\n'))
- badusage(_("file may not contain newlines"));
+ badusage(_("path may not contain newlines"));
filename = path_cleanup(path);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
