Merge branch 'master' of git@github.com:optixx/snesram

Conflicts:

	scripts/query_romsize.py

scripts/query_romsize.py

@@ -9,15 +9,20 @@ import popen2
 import glob
 import sys
 import pprint
+from subprocess import Popen
 
 
+path = "/Users/david/Devel/arch/avr/code/snesram/roms/"
 
 
+def shellquote(s):
+    return "'" + s.replace("'", "'\\''") + "'"
+
 def main():
     conn = sqlite3.connect('roms.sqlite3')
     c = conn.cursor()
     for i in [(4,),(8,),(16,),(32,)]:
-        dirname = "%02i" % i
+        dirname = os.path.join(path,"%02i" % i)
         if not os.path.isdir(dirname):
             os.mkdir(dirname)
         print "#" * 60
@@ -43,8 +48,15 @@ def main():
                       ''',i)
         for row in c:
             name,size,filename =  row
-                cmd = 'scp burst:"%s" %s/' % ( filename,dirname)
-                print cmd
+            if '[' not in filename:
+                src = "david@burst:%s" % filename
+                command = ["scp",shellquote(src), dirname]
+                proc = Popen(command)
+                print dir(proc)
+                proc.communicate()
+                
+                raise
+>>>>>>> b7b35800ccc7b48d24cfd4c3e025482e95e3fc72:scripts/query_romsize.py
 
 if __name__ == '__main__':
       main()