Merge lp:~14-jeevan/wifix/wifix into lp:wifix

[Jeevan]

Implemented isroot() function in platform.py

[Sam Dieck (samd)]

review: Approve

[lp:~14-jeevan/wifix/wifix]

107. By Jeevan on 2014-10-28

Shortened has_display function

[Jason Nikolas Pappas (blackknightiii)]

*awesome+work!great+job!

[Jason Nikolas Pappas (blackknightiii)]

Hello? This is your friend in 760 area code North Palm Springs, Ca Jason Nikolas Pappas=emc³blackknight+apokalypse

Sent from Yahoo Mail on Android

Unmerged revisions

107. By Jeevan on 2014-10-28

Shortened has_display function

106. By Jeevan on 2014-10-24

Implemented isroot() in platforms.py

=== modified file 'platforms.py'
--- platforms.py	2010-08-21 03:48:27 +0000
+++ platforms.py	2014-10-28 11:54:20 +0000
@@ -72,8 +72,11 @@
         Returns True if the current process is being executed with elevated
         privileges, False otherwise.
         """
+        if commands.getoutput("whoami")=="root":
+            return True;
 
-        raise NotImplementedError
+        return False;
+        
 
     def message(self, message):
         """
@@ -221,11 +224,8 @@
         return os.system("zenity --question --text='" + message + "'") == 0
 
     def has_display(self):
-        if (commands.getoutput('echo $DISPLAY') != ""):
-            return True
-        else:
-            return False
-
+        return commands.getoutput('echo $DISPLAY') != ""
+    
     def execute(self, command):
         return os.system(command)