Changeset 2723

Timestamp:

10/02/07 22:14:10 (6 years ago)

Author:

boltrix

Message:

Fixed a bug, and now I'm trying to put uninstaller to work properly.

Location:

trunk

Files:

• install_scripts/windows/umit_compiled.nsi (modified) (1 diff)
• umitCore/UmitConf.py (modified) (2 diffs)
• umitGUI/MainWindow.py (modified) (1 diff)
• umitGUI/ScanNotebook.py (modified) (6 diffs)
• umitGUI/ScanOpenPortsPage.py (modified) (4 diffs)

trunk/install_scripts/windows/umit_compiled.nsi

@@ -74 +74 @@
 
 Section "Uninstall"
-    Delete "$INSTDIR\*"
+    ;Delete "$INSTDIR\*"
     Delete "$SMPROGRAMS\Umit"
     RMDir "$INSTDIR"
     RMDir "$SMPROGRAMS\Umit"
-  
+
   remove_uninstaller:
       Delete "$INSTDIR\Umit-Uninstaller.exe"  

trunk/umitCore/UmitConf.py

@@ -195 +195 @@
 
     def _get_it(self, profile, attribute):
-        if profile:
-            self._verify_profile(profile)
+        if self._verify_profile(profile):
             return self.get(profile, attribute)
         return ""
 
     def _set_it(self, profile, attribute, value=''):
-        if profile:
-            self._verify_profile(profile)
+        if self._verify_profile(profile):
             return self.set(profile, attribute, value)
 
@@ -229 +227 @@
     def _verify_profile(self, profile_name):
         if profile_name not in self.sections():
-            raise ProfileNotFound(profile_name)
+            return False
+        return True
 
 class CommandProfile (Profile, object):

trunk/umitGUI/MainWindow.py

@@ -356 +356 @@
         page = self.scan_notebook.get_nth_page(page_num)
         filename = None
-        
+
+        if page == None:
+            return True
+
         if page.status.unsaved_unchanged \
                or page.status.unsaved_changed\

trunk/umitGUI/ScanNotebook.py

@@ -950 +950 @@
             key = model_service_list[i[0]][0]
             if self.services.has_key(key):
-                serv_objs.append(key)
+                serv_objs.append(self.services[key])
 
         # Removing current widgets from the host details page
         self.clean_host_details()
-        
+
         if len(serv_objs) == 1:
             self.set_single_service_host(serv_objs[0]['hosts'])
@@ -1108 +1108 @@
         for p in ports:
             host_page.add_port([self.findout_service_icon(p),
-                                p.get('portid', ''),
+                                int(p.get('portid', '0')),
                                 p.get('protocol', ''),
                                 p.get('port_state', ''),
@@ -1122 +1122 @@
             host_page.add_host([self.findout_service_icon(h),
                                 h.get('hostname', ''),
-                                h.get('portid', ''),
+                                int(h.get('portid', '0')),
                                 h.get('protocol', ''),
                                 h.get('port_state', ''),
@@ -1136 +1136 @@
         for host in host_list:
             parent = host_page.port_tree.append(None, [host['host'].\
-                                            get_hostname(),'','','','','', ''])
+                                            get_hostname(),0,'','','','', ''])
             for port in host['host'].get_ports():
                 for p in port.get('port', []):
@@ -1142 +1142 @@
                                 ['',
                                  self.findout_service_icon(p),
-                                 p.get('portid', ""),
+                                 int(p.get('portid', "0")),
                                  p.get('protocol', ''),
                                  p.get('port_state', ""),
@@ -1155 +1155 @@
         for host in service_list:
             parent = host_page.host_tree.append(None, [host['service_name'],
-                                                       '','','','','', '', ''])
+                                                       '','',0,'','', '', ''])
             for h in host['hosts']:
                 host_page.host_tree.append(parent, \
-                                           ['', self.findout_service_icon(h),
+                                           ['',
+                                            self.findout_service_icon(h),
                                             h["hostname"],
-                                            h.get('portid', ""),
+                                            int(h.get('portid', "0")),
                                             h.get('protocol', ""),
                                             h.get('port_state', _("Unknown")),

trunk/umitGUI/ScanOpenPortsPage.py

@@ -25 +25 @@
 from higwidgets.higtables import HIGTable
 
+from umitCore.UmitLogging import log
 from umitCore.I18N import _
 
@@ -51 +52 @@
         # Ports view
         self.port_columns = {}
-        self.port_list = gtk.ListStore(str, str, str, str, str, str, str)
-        self.port_tree = gtk.TreeStore(str, str, str, str, str, str, str)
+        self.port_list = gtk.ListStore(str, str, int, str, str, str, str)
+        self.port_tree = gtk.TreeStore(str, str, int, str, str, str, str)
         
         self.port_view = gtk.TreeView(self.port_list)
@@ -69 +70 @@
         # Host services view
         self.host_columns = {}
-        self.host_list = gtk.ListStore(str, str, str, str, str, str, str, str)
-        self.host_tree = gtk.TreeStore(str, str, str, str, str, str, str, str)
+        self.host_list = gtk.ListStore(str, str, str, int, str, str, str, str)
+        self.host_tree = gtk.TreeStore(str, str, str, int, str, str, str, str)
         
         self.host_view = gtk.TreeView(self.host_list)
@@ -242 +243 @@
     
     def add_port(self, port_info):
+        log.debug(">>> Add Port: %s" % port_info)
         self.port_list.append([""] + port_info)
 
     def add_host(self, host_info):
+        log.debug(">>> Add Host: %s" % host_info)
         self.host_list.append([""] + host_info)