[Commits] (john) Harhat bug: Install VC 7.0, Install .Net SDK. It finds the wong compiler. This fixes the problem

commits at osafoundation.org commits at osafoundation.org
Wed Jan 7 14:53:00 PST 2004


Commit by: john
Modified files:
osaf/hardhat/os_win.py 1.8 1.9

Log message:
Harhat bug: Install VC 7.0, Install .Net SDK. It finds the wong compiler. This fixes the problem


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/hardhat/os_win.py.diff?r1=text&tr1=1.8&r2=text&tr2=1.9

Index: osaf/hardhat/os_win.py
diff -u osaf/hardhat/os_win.py:1.8 osaf/hardhat/os_win.py:1.9
--- osaf/hardhat/os_win.py:1.8	Fri Aug  1 23:36:56 2003
+++ osaf/hardhat/os_win.py	Wed Jan  7 14:52:30 2004
@@ -1,8 +1,8 @@
-__version__     = "$Revision: 1.8 $"
-__date__        = "$Date: 2003/08/02 06:36:56 $"
+__version__     = "$Revision: 1.9 $"
+__date__        = "$Date: 2004/01/07 22:52:30 $"
 __copyright__   = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__     = "GPL -- see LICENSE.txt"
-__revision__ = "$Id: os_win.py,v 1.8 2003/08/02 06:36:56 morgen Exp $"
+__revision__ = "$Id: os_win.py,v 1.9 2004/01/07 22:52:30 john Exp $"
 
 
 """
@@ -135,13 +135,19 @@
             d = read_keys(base, r"Software\Microsoft\VisualStudio")
             if d:
                 for value in d:
+                    key = (r"Software\Microsoft\VisualStudio\%s" % (value))
+                    d2 = read_values(base, key)
                     try:
-                        number = float (value)
-                    except ValueError:
+                        if d2["installdir"]:
+                            try:
+                                number = float (value)
+                            except ValueError:
+                                pass
+                            else:
+                                if number > self.version:
+                                    self.version = number
+                    except KeyError:
                         pass
-                    else:
-                       if number > self.version:
-                           self.version = number
 
         if not self.version:
             print "Couldn't find an installed version of Visual Studio. Exiting."



More information about the Commits mailing list