Blob Blame History Raw
--- system-config-bind-4.0.2/BIND.py.old	2006-06-07 20:26:02.000000000 +0200
+++ system-config-bind-4.0.2/BIND.py	2006-11-21 15:59:11.000000000 +0100
@@ -75,6 +75,18 @@
             return
         self.version = r[1]
         debug( 'BIND VERSION:',self.version)
+
+
+        r=commands.getstatusoutput('/bin/rpm -q bind')
+        if (r[0] != 0) or (len(r[1]) <= 0):
+            gui.error(_('Initialization Error'),
+                      _('rpm -q bind:\n')+str(r[0])+' :'+r[1],
+                      True
+                     )
+            return
+	debug( 'BIND PACKAGE:',r[1])
+	self.version_main = string.split(r[1],'-')[1];
+
         self.nmdc = NamedConf()        
         if len(self.nmdc.errors):
             gui.error(_('DNS Configuration File %s Initialisation Error:') % self.nmdc.files[0]['file'] , string.join(self.nmdc.errors,"\n"),True)
--- system-config-bind-4.0.2/GUI.py.old	2006-11-21 12:32:23.000000000 +0100
+++ system-config-bind-4.0.2/GUI.py	2006-11-21 16:00:56.000000000 +0100
@@ -186,13 +186,13 @@
             if(self.arm_pid == 0):
                 try:
                     if os.access('/usr/bin/firefox', os.X_OK):
-                        os.execl('/usr/bin/firefox','', '/usr/share/doc/bind-'+self.bind.version+'/arm/Bv9ARM.html')
+                        os.execl('/usr/bin/firefox','', '/usr/share/doc/bind-'+self.bind.version_main+'/arm/Bv9ARM.html')
                     elif os.access('/usr/bin/mozilla', os.X_OK):
-                        os.execl('/usr/bin/mozilla','', '/usr/share/doc/bind-'+self.bind.version+'/arm/Bv9ARM.html')
+                        os.execl('/usr/bin/mozilla','', '/usr/share/doc/bind-'+self.bind.version_main+'/arm/Bv9ARM.html')
                     elif os.access('/usr/bin/konqueror', os.X_OK):
-                        os.execl('/usr/bin/konqueror','', '/usr/share/doc/bind-'+self.bind.version+'/arm/Bv9ARM.html')
+                        os.execl('/usr/bin/konqueror','', '/usr/share/doc/bind-'+self.bind.version_main+'/arm/Bv9ARM.html')
                     elif os.access('/usr/bin/nautilus', os.X_OK):
-                        os.execl('/usr/bin/nautilus','', '/usr/share/doc/bind-'+self.bind.version+'/arm/Bv9ARM.html')
+                        os.execl('/usr/bin/nautilus','', '/usr/share/doc/bind-'+self.bind.version_main+'/arm/Bv9ARM.html')
                 except:
                     return