[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] storm Makefile import.py
From: |
Benja Fallenstein |
Subject: |
[Gzz-commits] storm Makefile import.py |
Date: |
Tue, 15 Apr 2003 04:24:50 -0400 |
CVSROOT: /cvsroot/storm
Module name: storm
Changes by: Benja Fallenstein <address@hidden> 03/04/15 04:24:50
Modified files:
. : Makefile import.py
Log message:
pass content type to 'make import'
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/Makefile.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/import.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: storm/Makefile
diff -u storm/Makefile:1.7 storm/Makefile:1.8
--- storm/Makefile:1.7 Tue Apr 15 04:20:14 2003
+++ storm/Makefile Tue Apr 15 04:24:50 2003
@@ -23,7 +23,7 @@
$(JAVA) $(DEBUG) $(PYTHONPATH) org.python.util.jython test.py org/
import:
- $(JAVA) $(DEBUG) $(PYTHONPATH) org.python.util.jython import.py $(POOL)
$(FILES)
+ $(JAVA) $(DEBUG) $(PYTHONPATH) org.python.util.jython import.py $(POOL)
$(CT) $(FILES)
########################
# Navidoc targets begin
Index: storm/import.py
diff -u storm/import.py:1.1 storm/import.py:1.2
--- storm/import.py:1.1 Tue Apr 15 04:20:14 2003
+++ storm/import.py Tue Apr 15 04:24:50 2003
@@ -27,13 +27,14 @@
if __name__ == '__main__':
dir = sys.argv[1]
- files = sys.argv[2:]
+ content_type = sys.argv[2]
+ files = sys.argv[3:]
pool = org.nongnu.storm.impl.DirPool(java.io.File(dir),
java.util.HashSet())
for file in files:
in_ = java.io.FileInputStream(file)
- out = pool.getBlockOutputStream('')
+ out = pool.getBlockOutputStream(content_type)
org.nongnu.storm.util.CopyUtil.copy(in_, out)
print "%s -- %s" % (file, out.getBlockId())