Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/proto/xcbproto/py-compile.patch
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Mon, 06 Mar 2017 15:06:15 -0800
changeset 1698 442d649bad81
parent 1549 4b5a9782609e
permissions -rw-r--r--
21767820 Cannot set anymore display resolution to 1280x1024
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1549
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     1
 
--- a/py-compile	Wed Apr 22 10:24:26 2015
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     2
 
+++ b/py-compile	Wed Apr 22 10:32:59 2015
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -129,10 +129,7 @@
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     4
 
 	    continue
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     5
 
     sys.stdout.write(file)
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     6
 
     sys.stdout.flush()
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     7
 
-    if hasattr(imp, 'get_tag'):
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     8
 
-        py_compile.compile(filepath, imp.cache_from_source(filepath), path)
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     9
 
-    else:
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    10
 
-        py_compile.compile(filepath, filepath + 'c', path)
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    11
 
+    py_compile.compile(filepath, filepath + 'c', path)
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    12
 
 sys.stdout.write('\n')" || exit $?
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    13
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    14
 
 # this will fail for python < 1.5, but that doesn't matter ...
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    15
 
@@ -153,10 +150,7 @@
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    16
 
 	    continue
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    17
 
     sys.stdout.write(file)
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    18
 
     sys.stdout.flush()
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    19
 
-    if hasattr(imp, 'get_tag'):
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    20
 
-        py_compile.compile(filepath, imp.cache_from_source(filepath, False), path)
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    21
 
-    else:
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    22
 
-        py_compile.compile(filepath, filepath + 'o', path)
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    23
 
+    py_compile.compile(filepath, filepath + 'o', path)
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    24
 
 sys.stdout.write('\n')" 2>/dev/null || :
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    25
4b5a9782609e 21256857 Update Xorg to the latest community version 1.17.2
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    26
 
 # Local Variables:
upstream/oracle/x-cons/x-s12-clone