[Pkg-privacy-commits] [tails-installer] 162/210: Merge branch 'develop' into feature/new-ui

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to tag 3.90.0
in repository tails-installer.

commit f72d47d3836cc3ad17b69265ae1ae44082c4b5bf
Merge: 2bc7617 dd55625
Author: Martin Briza <mbriza at redhat.com>
Date:   Tue Sep 8 09:53:26 2015 +0200

    Merge branch 'develop' into feature/new-ui
    
    Conflicts:
    	liveusb-creator

 liveusb-creator | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --cc liveusb-creator
index c1b48d9,e4d5965..4085639
--- a/liveusb-creator
+++ b/liveusb-creator
@@@ -96,18 -98,4 +101,14 @@@ def main()
              pass
  
  if __name__ == '__main__':
-     if sys.platform != 'win32':
-         if os.getuid() != 0:
-             print >> sys.stderr, _("You must run this application as root")
-             sys.exit(1)
 +
 +    if sys.platform == 'win32':
 +        import win32com.shell.shell as shell
 +        ASADMIN = 'asadmin'
 +        if sys.argv[-1] != ASADMIN:
 +            script = os.path.abspath(sys.argv[0])
 +            params = ' '.join([script] + sys.argv[1:] + [ASADMIN])
 +            shell.ShellExecuteEx(lpVerb='runas', lpFile=sys.executable, lpParameters=params)
 +            sys.exit(0)
 +
      main()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git