[126862] branches/release_2_3
jmr at macports.org
jmr at macports.org
Thu Oct 16 11:12:49 PDT 2014
Revision: 126862
https://trac.macports.org/changeset/126862
Author: jmr at macports.org
Date: 2014-10-16 11:12:49 -0700 (Thu, 16 Oct 2014)
Log Message:
-----------
merge r123652 from trunk:
don't fail due to stderr output when running dscl in addgroup
Revision Links:
--------------
https://trac.macports.org/changeset/123652
Modified Paths:
--------------
branches/release_2_3/base/src/port1.0/portutil.tcl
Property Changed:
----------------
branches/release_2_3/
branches/release_2_3/base/
Property changes on: branches/release_2_3
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,125859
+ /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125859
Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,125859
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,125859
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/release_2_3/base/src/port1.0/portutil.tcl
===================================================================
--- branches/release_2_3/base/src/port1.0/portutil.tcl 2014-10-16 18:03:14 UTC (rev 126861)
+++ branches/release_2_3/base/src/port1.0/portutil.tcl 2014-10-16 18:12:49 UTC (rev 126862)
@@ -2473,11 +2473,11 @@
set dscl [findBinary dscl $portutil::autoconf::dscl_path]
set failed? 0
try {
- exec $dscl . -create /Groups/${name} Password ${passwd}
- exec $dscl . -create /Groups/${name} RealName ${realname}
- exec $dscl . -create /Groups/${name} PrimaryGroupID ${gid}
+ exec -ignorestderr $dscl . -create /Groups/${name} Password ${passwd}
+ exec -ignorestderr $dscl . -create /Groups/${name} RealName ${realname}
+ exec -ignorestderr $dscl . -create /Groups/${name} PrimaryGroupID ${gid}
if {${users} ne ""} {
- exec $dscl . -create /Groups/${name} GroupMembership ${users}
+ exec -ignorestderr $dscl . -create /Groups/${name} GroupMembership ${users}
}
} catch {{CHILDKILLED *} eCode eMessage} {
# the foreachs are a simple workaround for Tcl 8.4, which doesn't
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141016/56e59776/attachment.html>
More information about the macports-changes
mailing list