diff options
| author | tv <tv> | 2005-02-09 23:56:10 +0000 |
|---|---|---|
| committer | tv <tv> | 2005-02-09 23:56:10 +0000 |
| commit | 3da465aae436a57a916a9aaf35a511b21b053348 (patch) | |
| tree | 61eb9f123ca3f2a43732c36f77663d1662be012a | |
| parent | 7fc351923b8d50c7f92d6c2eacca5a4fca127ac6 (diff) | |
| download | pkgsrc-3da465aae436a57a916a9aaf35a511b21b053348.tar.gz | |
Fix Interix user/group failsafe so that it works on PKG_USERS with \\ in them.
| -rw-r--r-- | mk/bsd.pkg.install.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk index 1c774b7bced..5a35c381617 100644 --- a/mk/bsd.pkg.install.mk +++ b/mk/bsd.pkg.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.install.mk,v 1.81 2005/02/05 01:17:59 jlam Exp $ +# $NetBSD: bsd.pkg.install.mk,v 1.82 2005/02/09 23:56:10 tv Exp $ # # This Makefile fragment is included by bsd.pkg.mk to use the common # INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply: @@ -111,9 +111,9 @@ FILES_SUBST+= PKG_USER_SHELL=${_PKG_USER_SHELL} # compile without changing something. # .if !empty(OPSYS:MInterix) -. for user in ${PKG_USERS} -. if !defined(BROKEN) && !empty(PKG_GROUPS:M${user:C/:.*//}) -BROKEN:= "User and group '${user:C/:.*//}' cannot have the same name on Interix" +. for user in ${PKG_USERS:C/\\\\//g:C/:.*//} +. if !empty(PKG_GROUPS:M${user}) +PKG_FAIL_REASON+= "User and group '${user}' cannot have the same name on Interix" . endif . endfor .endif |