Changeset 3504

Timestamp:

Jun 19, 2007, 4:26:58 AM (18 years ago)

Author:

bird

Message:

Some .exe fixes.

Location:

trunk/essentials/sys-apps/prefix-portage/pym/portage

Files:

• const.py (modified) (1 diff)
• dbapi/porttree.py (modified) (1 diff)
• process.py (modified) (3 diffs)

trunk/essentials/sys-apps/prefix-portage/pym/portage/const.py

@@ -75 +75 @@
     
 # bird: Added EXEEXT for appending ".exe" on OS/2 and windows.
-EXEEXT                  = "@EXEEXT"
+EXEEXT                  = "@EXEEXT@"
 if EXEEXT == "@"+"EXEEXT"+"@":
         EXEEXT              = ""

trunk/essentials/sys-apps/prefix-portage/pym/portage/dbapi/porttree.py

@@ -656 +656 @@
                                 continue
                         except PortageException, e:
-                                writemsg("!!! Error: aux_get('%s', %s)\n" % (mycpv, aux_keys),
-                                        mycpv, noiselevel=-1)
+                                #writemsg("!!! Error: aux_get('%s', %s)\n" % (mycpv, aux_keys),
+                                #       mycpv, noiselevel=-1) wtf?
+                                writemsg("!!! Error: aux_get('%s', %s)\n" % (mycpv, aux_keys), mycpv)
                                 writemsg("!!! %s\n" % str(e), noiselevel=-1)
                                 del e

trunk/essentials/sys-apps/prefix-portage/pym/portage/process.py

@@ -9 +9 @@
 
 from portage.util import dump_traceback
-from portage.const import BASH_BINARY, SANDBOX_BINARY
+from portage.const import BASH_BINARY, SANDBOX_BINARY, EXEEXT
 from portage.exception import CommandNotFound
 
@@ -171 +171 @@
                 binary = path_lookup and find_binary(binary) or None
                 # bird: try with exe suffix appended
-                if not binary and sys.platform == "os2knix":
-                        binary = mycommand[0]+".exe"
+                if not binary and EXEEXT != "":
+                        binary = mycommand[0]+EXEEXT
                         if (not os.path.isabs(binary) or not os.path.isfile(binary)
                                 or not os.access(binary, os.X_OK)):
@@ -367 +367 @@
                 if os.access(filename, os.X_OK) and os.path.isfile(filename):
                         return filename
+                if EXEEXT != "":
+                        if os.access(filename+EXEEXT, os.X_OK) and os.path.isfile(filename+EXEEXT):
+                                return filename+EXEEXT
         return None