diff options
| -rwxr-xr-x | lorry.gzip-importer | 30 | ||||
| -rwxr-xr-x | lorry.zip-importer | 30 |
2 files changed, 38 insertions, 22 deletions
diff --git a/lorry.gzip-importer b/lorry.gzip-importer index 8bc18ed..8d482b7 100755 --- a/lorry.gzip-importer +++ b/lorry.gzip-importer @@ -9,19 +9,11 @@ import struct import sys -if len(sys.argv) < 2: - print('usage:', sys.argv[0], '<gzipfile>...') - sys.exit(1) - branch_name = 'master' branch_ref = 'refs/heads/%s' % branch_name committer_name = 'Lorry Gzip Importer' committer_email = 'lorry-gzip-importer@lorry' -fast_import = os.popen('git fast-import --quiet', 'w') -def printlines(list): - for str in list: - fast_import.write(str + "\n") # The size of a gzip file is stored in the last 4 bytes def uncompressedsize(filename): @@ -29,7 +21,11 @@ def uncompressedsize(filename): f.seek(-4, 2) return struct.unpack('I', f.read(4))[0] -for zipfile in sys.argv[1:]: + +def export(zipfile, fast_import): + def printlines(list): + for str in list: + fast_import.write(str + "\n") # Gzip does have an encoded mtime, however Python's GzipFile # just ignores it, so we just yank the mtime of the zip file itself. @@ -57,5 +53,17 @@ for zipfile in sys.argv[1:]: 'from ' + branch_ref, 'tagger ' + committer, \ 'data <<EOM', 'Package ' + zipfile, 'EOM', '')) -if fast_import.close(): - sys.exit(1) + +def main(): + if len(sys.argv) < 2: + print('usage:', sys.argv[0], '<gzipfile>...') + sys.exit(1) + + fast_import = os.popen('git fast-import --quiet', 'w') + for zipfile in sys.argv[1:]: + export(zipfile, fast_import) + if fast_import.close(): + sys.exit(1) + + +main() diff --git a/lorry.zip-importer b/lorry.zip-importer index c1b511c..7eca8f6 100755 --- a/lorry.zip-importer +++ b/lorry.zip-importer @@ -17,21 +17,17 @@ import time from zipfile import ZipFile -if len(sys.argv) < 2: - print('usage:', sys.argv[0], '<zipfile>...') - sys.exit(1) - branch_name = 'master' branch_ref = 'refs/heads/%s' % branch_name committer_name = 'Lorry Zip Importer' committer_email = 'lorry-zip-importer@lorry' -fast_import = os.popen('git fast-import --quiet', 'w') -def printlines(list): - for str in list: - fast_import.write(str + "\n") -for zipfile in sys.argv[1:]: +def export(zipfile, fast_import): + def printlines(list): + for str in list: + fast_import.write(str + "\n") + commit_time = 0 next_mark = 1 common_prefix = None @@ -77,5 +73,17 @@ for zipfile in sys.argv[1:]: 'from ' + branch_ref, 'tagger ' + committer, \ 'data <<EOM', 'Package ' + zipfile, 'EOM', '')) -if fast_import.close(): - sys.exit(1) + +def main(): + if len(sys.argv) < 2: + print('usage:', sys.argv[0], '<zipfile>...') + sys.exit(1) + + fast_import = os.popen('git fast-import --quiet', 'w') + for zipfile in sys.argv[1:]: + export(zipfile, fast_import) + if fast_import.close(): + sys.exit(1) + + +main() |