Sfoglia il codice sorgente

prefer SUDO_USER over logname to find login for granting schroot access

SUDO_USER is reported to work more reliably in certain scenarios
(see #1713) and it can be overridden easily if running as root.
Ashish Kulkarni 11 anni fa
parent
commit
659d306478
1 ha cambiato i file con 3 aggiunte e 6 eliminazioni
  1. 3 6
      scripts/build.py

+ 3 - 6
scripts/build.py

@@ -413,17 +413,14 @@ ARCH = ['i386']
 
 def check_setup_schroot(config):
     check_running_on_debian()
-    login = get_output('logname') or os.environ.get('SUDO_USER')
-    if not login:
+    login = os.environ.get('SUDO_USER') or get_output('logname')
+    if not login or login == 'root':
         error('Unable to determine the login for which schroot access is to be given.')
 
-    if login == 'root':
-        error('Please run via sudo to determine login for which schroot access is to be given.')
-
 def build_setup_schroot(config, basedir):
     install_packages('git', 'debootstrap', 'schroot', 'rinse')
 
-    login  = get_output('logname') or os.environ.get('SUDO_USER')
+    login  = os.environ.get('SUDO_USER') or get_output('logname')
     chroot = config[1+config.rindex('-'):]
     for arch in ARCH:
         print '******************* %s-%s' % (chroot, arch)