diff options
author | Brian Dolbec <dolsen@gentoo.org> | 2015-05-11 17:52:23 -0700 |
---|---|---|
committer | Brian Dolbec <dolsen@gentoo.org> | 2015-05-11 17:57:04 -0700 |
commit | 50f2eb3dbe8fc6f5bc2d7df43b3c56e4046dc303 (patch) | |
tree | 291d9d0c55c8e40e8eb7b88e7a1bd00c799fba8c | |
parent | dispatch-conf: handle file/directory collisions (bug 256376) (diff) | |
download | portage-50f2eb3dbe8fc6f5bc2d7df43b3c56e4046dc303.tar.gz portage-50f2eb3dbe8fc6f5bc2d7df43b3c56e4046dc303.tar.bz2 portage-50f2eb3dbe8fc6f5bc2d7df43b3c56e4046dc303.zip |
portage/sync/modules/webrsync: Correct the kwargs.pop() to pop self.spawn_kwargs
With usersync and the repo has portage:portage ownership, the SyncManager.pre_sync()
sets the uid, gid, groups accordingly to spawn the process with.
If the PORTAGE_GPG_DIR is not the same uid, gid, then it will fail to gpg verify.
Dropping these causes the emerge-webrsync binary to run as root, maintaining correct functionality.
-rw-r--r-- | pym/portage/sync/modules/webrsync/webrsync.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/sync/modules/webrsync/webrsync.py b/pym/portage/sync/modules/webrsync/webrsync.py index f7ae3e534..92208b53d 100644 --- a/pym/portage/sync/modules/webrsync/webrsync.py +++ b/pym/portage/sync/modules/webrsync/webrsync.py @@ -37,7 +37,7 @@ class WebRsync(SyncBase): # filter these out to prevent gpg errors for var in ['uid', 'gid', 'groups']: - kwargs.pop(var, None) + self.spawn_kwargs.pop(var, None) exitcode = portage.process.spawn_bash("%s" % \ (self.bin_command), |