commit:     5bf680dd48f9a6bd2c955548aba8d030b6981a9b
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 23:07:28 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat May  9 23:07:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=5bf680dd

portage/sync/modules/webrsync: Fileter out uid, gid, groups from kwargs

The webrsync module was getting gpg errors, but not when running the 
emerge-webrsync 
binary directly.
X-Gentoo-forums: https://forums.gentoo.org/viewtopic-t-1015578-start-25.html

 pym/portage/sync/modules/webrsync/webrsync.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pym/portage/sync/modules/webrsync/webrsync.py 
b/pym/portage/sync/modules/webrsync/webrsync.py
index b22a2a4..f7ae3e5 100644
--- a/pym/portage/sync/modules/webrsync/webrsync.py
+++ b/pym/portage/sync/modules/webrsync/webrsync.py
@@ -35,6 +35,10 @@ class WebRsync(SyncBase):
                if not self.has_bin:
                        return (1, False)
 
+               # filter these out to prevent gpg errors
+               for var in ['uid', 'gid', 'groups']:
+                       kwargs.pop(var, None)
+
                exitcode = portage.process.spawn_bash("%s" % \
                        (self.bin_command),
                        **portage._native_kwargs(self.spawn_kwargs))

Reply via email to