From e0b82943174b217b5c348e848314bb0131e47743 Mon Sep 17 00:00:00 2001
From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Wed, 6 Jun 2012 07:29:04 +0800
Subject: [PATCH] remove su-wraper config in gbs config file, use sudo always

---
 distfiles/debian/control |  3 ++-
 distfiles/gbs.spec       |  1 +
 gitbuildsys/cmd_build.py | 17 +++--------------
 gitbuildsys/conf.py      |  2 --
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/distfiles/debian/control b/distfiles/debian/control
index b3fbe2a..c51167c 100644
--- a/distfiles/debian/control
+++ b/distfiles/debian/control
@@ -14,7 +14,8 @@ Depends: ${misc:Depends}, ${python:Depends},
  build (>= 2011.10.10),
  rpm,
  qemu-arm-static (>= 0.14.1) | qemu-user-static,
- binfmt-support
+ binfmt-support,
+ sudo
 Description: The command line tools for Tizen package developers
   The command line tools for Tizen package developers will
   be used to do packaging related tasks. 
diff --git a/distfiles/gbs.spec b/distfiles/gbs.spec
index aac4cdc..46f30b1 100644
--- a/distfiles/gbs.spec
+++ b/distfiles/gbs.spec
@@ -14,6 +14,7 @@ Requires:   osc >= 0.131
 Requires:   build >= 2011.10.10
 Requires:   qemu >= 0.14.1
 Requires:   qemu-arm-static >= 0.14.1
+Requires:   sudo
 %if 0%{?fedora_version}
 Requires:   rpm-build
 %else
diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index 0870f93..0141b2d 100644
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -148,11 +148,7 @@ def setup_qemu_emulator():
             os.write(tmpfd, "echo '%s' > /proc/sys/fs/binfmt_misc/register" % qemu_arm_string)
             os.close(tmpfd)
             # on this way can work to use sudo register qemu emulator
-            sucmd = configmgr.get('su-wrapper', 'build')
-            if sucmd:
-                ret = os.system('%s sh %s' % (sucmd, tmppth))
-            else:
-                ret = os.system('sudo sh %s' % tmppth)
+            ret = os.system('sudo sh %s' % tmppth)
             if ret != 0:
                 raise errors.QemuError('failed to set up qemu arm environment')
         except IOError:
@@ -330,15 +326,8 @@ def do(opts, args):
     if os.getuid() == 0:
         os.environ['GBS_BUILD_REPOAUTH'] = repo_auth_conf
     else:
-        sucmd = configmgr.get('su-wrapper', 'build').split()
-        if sucmd:
-            if sucmd[0] == 'su':
-                if sucmd[-1] == '-c':
-                    sucmd.pop()
-                cmd = sucmd + ['-s', cmd[0], 'root', '--' ] + cmd[1:]
-            else:
-                cmd = sucmd + proxies + ['GBS_BUILD_REPOAUTH=%s' % \
-                      repo_auth_conf ] + cmd
+        cmd = ['sudo'] + proxies + ['GBS_BUILD_REPOAUTH=%s' % \
+              repo_auth_conf ] + cmd
 
     # runner.show() can't support interactive mode, so use subprocess insterad.
     msger.debug("running command %s" % cmd)
diff --git a/gitbuildsys/conf.py b/gitbuildsys/conf.py
index 9d6e778..41ceff7 100644
--- a/gitbuildsys/conf.py
+++ b/gitbuildsys/conf.py
@@ -228,7 +228,6 @@ class ConfigMgr(object):
             'build': {
                 'build_cmd':    '/usr/bin/build',
                 'build_root':   '/var/tmp/build-root-gbs',
-                'su-wrapper':   'sudo',
                 'distconf':     '/usr/share/gbs/tizen-1.0.conf',
             },
             'import': {
@@ -251,7 +250,6 @@ passwdx = $remotebuild__passwdx
 [build]
 build_cmd = $build__build_cmd
 build_root = $build__build_root
-su_wrapper = $build__su_wrapper
 distconf = $build__distconf
 
 ; optional, repos definitions
-- 
2.7.4