From 4432852c338b633d1820fd47477746f42d3ba936 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 28 Aug 2012 14:46:13 +0300 Subject: [PATCH] Used current user's name instead of config option. In cmd_build user name from [remotebuild] section of configuration file was used as a part of temporary directory name. This approach is confusing (why anything from remotebuild is used in build mode?) and it also caused gbs crash when the same name is mentioned in [remotebuild] section for different local users. Fixes #283 Change-Id: Ie789564811aa0a9271962d7584421592c215ef7d --- gitbuildsys/cmd_build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py index ef5099f..c68f91b 100644 --- a/gitbuildsys/cmd_build.py +++ b/gitbuildsys/cmd_build.py @@ -27,6 +27,7 @@ import urllib2 import glob import shutil import base64 +import pwd from urlparse import urlsplit, urlunsplit from gitbuildsys import msger, utils, runner, errors @@ -296,7 +297,7 @@ def do(opts, args): (buildarch, ','.join(SUPPORTEDARCHS))) build_cmd = configmgr.get('build_cmd', 'build') - userid = configmgr.get('user', 'remotebuild') + userid = pwd.getpwuid(os.getuid())[0] tmpdir = configmgr.get('tmpdir', 'general') build_root = os.path.join(tmpdir, userid, 'gbs-buildroot.%s' % buildarch) if opts.buildroot: -- 2.7.4