Merge lp:~clicompanion-devs/clicompanion/branch-km0r3 into lp:clicompanion

[Kenny Meyer]

Fixed lp:611145

[Duane Hinnen (duanedesign)]

review: Approve

=== modified file '.clicompanion'
--- .clicompanion	2010-08-01 04:10:34 +0000
+++ .clicompanion	2010-08-05 00:43:40 +0000
@@ -1,15 +1,15 @@
 dpkg -l: package : Find version of a package
-df -h : : file system disk space usage
-free -m : : show RAM usage
-ps auxww | grep : process : displays information about the active process
-iwconfig : : Display wireless network information
-ifconfig -a : : displays the status of the currently active interfaces
-sudo iwlist : : scan Scan Wireless networks
-sudo /etc/init.d/networking restart : : Reset the Network
-lsb_release -a : : What version of Ubuntu do I have?
-uname -a : : What kernel am I running
-sudo apt-get update && sudo apt-get upgrade : : Refresh update info and update all packages 
-sudo apt-get clean : : clear out all packages in /var/cache/apt/archives
+df -h: : file system disk space usage
+free -m: : show RAM usage
+ps auxww | grep: process : displays information about the active process
+iwconfig: : Display wireless network information
+ifconfig -a: : displays the status of the currently active interfaces
+sudo iwlist: : scan Scan Wireless networks
+sudo /etc/init.d/networking restart: : Reset the Network
+lsb_release -a: : What version of Ubuntu do I have?
+uname -a: : What kernel am I running
+sudo apt-get update && sudo apt-get upgrade: : Refresh update info and update all packages 
+sudo apt-get clean: : clear out all packages in /var/cache/apt/archives
 sudo apt-get autoclean : : clear out obsolete packages(packages with a newer release)
 apt-cache search :package : Find information on a package (not installed)
 sudo lshw : : List hardware 
 
=== modified file 'clicompanion.0.0.7.py'
--- clicompanion.0.0.7.py	2010-08-01 04:10:34 +0000
+++ clicompanion.0.0.7.py	2010-08-05 00:43:40 +0000
@@ -228,10 +228,10 @@
                 # Python raises a TypeError if row data doesn't exist. Catch
                 # that and fail silently.
                 pass
-        
+
         modelfilter.set_visible_func(search, search_term) 
         self.treeview.set_model(modelfilter)
-            
+
     #send the command to the terminal
     def run_command(self, widget, data=None):
         global ROW
@@ -248,15 +248,26 @@
             Companion.vte.feed_child(cmnd+"\n") #send command
             Companion.vte.show()
             Companion.vte.grab_focus()
-     
+
      #open the man page for selected command
     def man_page(self, widget, data=None):
         row_int = int(ROW[0][0]) # removes everything but number from EX: [5,]
         cmnd = CMNDS[row_int] #CMNDS is where commands are store
-        splitcommand=cmnd.split(" ")
+        splitcommand = self._filter_sudo_from(cmnd.split(" "))
         Companion.vte.feed_child("man "+splitcommand[0]+"| most \n") #send command
         self.vte.grab_focus()
         Companion.vte.show()
+
+    @staticmethod
+    def _filter_sudo_from(command):
+        """Filter the sudo from `command`, where `command` is a list.
+        
+        Return the command list with the "sudo" filtered out.
+        """
+        if command[0].startswith("sudo"):
+            del command[0]
+            return command
+        return command
     
     # open file containing command dictionary and put it in a variable
     def update(self):