From: Fabian Groffen Date: Mon, 9 Jun 2008 20:03:53 +0000 (-0000) Subject: store rootgid in portage.const_autotool.py, and use it instead of hardcoded 0 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cd3770cb370e49af62ff442cc10c9674f43f51a3;p=portage.git store rootgid in portage.const_autotool.py, and use it instead of hardcoded 0 svn path=/main/branches/prefix/; revision=10624 --- diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 1fee3e8d9..390ec238d 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -93,7 +93,7 @@ try: DEPRECATED_PROFILE_FILE, USER_VIRTUALS_FILE, EBUILD_SH_ENV_FILE, \ INVALID_ENV_FILE, CUSTOM_MIRRORS_FILE, CONFIG_MEMORY_FILE,\ INCREMENTALS, EAPI, MISC_SH_BINARY, REPO_NAME_LOC, REPO_NAME_FILE, \ - EPREFIX, EPREFIX_LSTRIP, BPREFIX + EPREFIX, EPREFIX_LSTRIP, BPREFIX, rootgid from portage.data import ostype, lchown, userland, secpass, uid, wheelgid, \ portage_uid, portage_gid, userpriv_groups @@ -3396,7 +3396,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", # to have root's gid. Therefore, use root's gid instead of # portage's gid to avoid spurrious permissions adjustments # when inside fakeroot. - dir_gid = 0 + dir_gid = rootgid distdir_dirs = [""] if "distlocks" in features: distdir_dirs.append(".locks") diff --git a/pym/portage/const_autotool.py b/pym/portage/const_autotool.py index c1b1e124f..8a5c5e9ac 100644 --- a/pym/portage/const_autotool.py +++ b/pym/portage/const_autotool.py @@ -5,7 +5,7 @@ # all vars that are to wind up in portage_const must have their name listed in __all__ __all__ = ["EAPIPREFIX", "EPREFIX", "SYSCONFDIR", "DATADIR", "PORTAGE_BASE", - "portageuser", "portagegroup", "rootuser", "rootuid"] + "portageuser", "portagegroup", "rootuser", "rootuid", "rootgid"] from os import path @@ -19,3 +19,4 @@ portagegroup = "@portagegroup@" portageuser = "@portageuser@" rootuser = "@rootuser@" rootuid = @rootuid@ +rootgid = @rootgid@