Skip to content

Instantly share code, notes, and snippets.

@masami256
Created July 1, 2014 14:43
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save masami256/c6700036d6c56c4e7d25 to your computer and use it in GitHub Desktop.
Save masami256/c6700036d6c56c4e7d25 to your computer and use it in GitHub Desktop.
archでOSvをビルドするhackなパッチ
diff --git a/scripts/osv/modules/api.py b/scripts/osv/modules/api.py
index 59a709d..7b88415 100644
--- a/scripts/osv/modules/api.py
+++ b/scripts/osv/modules/api.py
@@ -29,7 +29,7 @@ class java_app(object):
def _to_args_list(text_or_list):
if not text_or_list:
return []
- if isinstance(text_or_list, basestring):
+ if isinstance(text_or_list, str):
return text_or_list.split()
return text_or_list
diff --git a/scripts/upload_manifest.py b/scripts/upload_manifest.py
index 89999a4..d9215ec 100755
--- a/scripts/upload_manifest.py
+++ b/scripts/upload_manifest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import os, sys, struct, optparse, io, subprocess, shutil, socket, time, threading, stat
try:
@masami256
Copy link
Author

osv/modules/api.pyはbasestringがpython3系から削除されているのでそれの対応
upload_manifest.pyはarchのpython 3.4.1でsocket.sendall()がブロックして処理が返ってこないのでPython2系を使うようにしたハックすぎる対応

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment