patches/Python-04-distutils-log.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 8162 ab63e00d2219
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8162
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     1
--- Python-2.4.2/Lib/distutils/spawn.py	2004-11-10 14:23:14.000000000 -0800
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     2
+++ Python-2.4.2-new/Lib/distutils/spawn.py	2006-08-22 08:33:41.430344000 -0700
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     3
@@ -73,7 +73,7 @@
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     4
     if search_path:
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     5
         # either we find one or it stays the same
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     6
         executable = find_executable(executable) or executable
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     7
-    log.info(string.join([executable] + cmd[1:], ' '))
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     8
+    log.info("%s", string.join([executable] + cmd[1:], ' '))
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
     9
     if not dry_run:
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    10
         # spawn for NT requires a full path to the .exe
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    11
         try:
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    12
@@ -98,7 +98,7 @@
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    13
     if search_path:
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    14
         # either we find one or it stays the same
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    15
         executable = find_executable(executable) or executable
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    16
-    log.info(string.join([executable] + cmd[1:], ' '))
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    17
+    log.info("%s", string.join([executable] + cmd[1:], ' '))
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    18
     if not dry_run:
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    19
         # spawnv for OS/2 EMX requires a full path to the .exe
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    20
         try:
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    21
@@ -119,7 +119,7 @@
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    22
                   verbose=0,
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    23
                   dry_run=0):
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    24
 
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    25
-    log.info(string.join(cmd, ' '))
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    26
+    log.info("%s", string.join(cmd, ' '))
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    27
     if dry_run:
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    28
         return
ab63e00d2219 2006-09-18 Laszlo (Laca) Peter <[email protected]>
lp117937
parents:
diff changeset
    29
     exec_fn = search_path and os.execvp or os.execv