Attachment 8847 Details for Bug 18373 – file.diff

[patch] file.diff

file.diff (text/plain), 1.42 KB, created by Ben Smithurst on 2000-05-03 18:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Smithurst

Created: 2000-05-03 18:20:03 UTC

Size: 1.42 KB

patch

obsolete

>Index: main.c
>===================================================================
>RCS file: /usr/cvs/src/usr.sbin/pkg_install/delete/main.c,v
>retrieving revision 1.17
>diff -u -r1.17 main.c
>--- main.c	2000/02/18 07:00:01	1.17
>+++ main.c	2000/05/03 14:43:46
>@@ -107,8 +107,11 @@
>     if (pkgs == start)
> 	warnx("missing package name(s)"), usage();
>     *pkgs = NULL;
>-    if (!Fake && getuid() != 0)
>-	errx(1, "you must be root to delete packages");
>+    if (!Fake && getuid() != 0) {
>+	if (!Force)
>+	    errx(1, "you must be root to delete packages");
>+	warnx("you must be root to delete packages (proceeding anyway)");
>+    }
>     if ((error = pkg_perform(start)) != 0) {
> 	if (Verbose)
> 	    warnx("%d package deletion(s) failed", error);
>Index: pkg_delete.1
>===================================================================
>RCS file: /usr/cvs/src/usr.sbin/pkg_install/delete/pkg_delete.1,v
>retrieving revision 1.16
>diff -u -r1.16 pkg_delete.1
>--- pkg_delete.1	2000/02/29 15:13:53	1.16
>+++ pkg_delete.1	2000/05/03 14:38:29
>@@ -94,7 +94,12 @@
> the package.  
> .It Fl f
> Force removal of the package, even if a dependency is recorded or the
>-deinstall or require script fails.
>+deinstall or require script fails.  This flag also allows
>+.Nm
>+to be run by non-root users, which can be useful for porters if the port has
>+been installed to a directory writable by that user, and if
>+.Ev PKG_DBDIR
>+has been set to a directory writable by that user.
> .El
> 
> .Pp

Actions: View | Diff

Attachments on bug 18373: 8847 | 8848