archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correct sha1_from_file (broke checkout)

Browse Source
This commit is contained in:
Campbell Barton
2014-11-05 12:02:44 +01:00
parent 24e7e8a9d5
commit 0f2ada1ea0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/cli/bam.py
View File

@@ -195,6 +195,7 @@ class bam_utils:
import sys import sys
import os import os
import requests import requests
from bam_utils.system import sha1_from_file
# TODO(cam) ignore files # TODO(cam) ignore files
@@ -213,7 +214,7 @@ class bam_utils:
paths_modified = {} paths_modified = {}
for fn, sha1 in paths_uuid.items(): for fn, sha1 in paths_uuid.items():
fn_abs = os.path.join(path, fn) fn_abs = os.path.join(path, fn)
if bam_utils.sha1_for_file(fn_abs) != sha1: if sha1_from_file(fn_abs) != sha1:
paths_modified[fn] = fn_abs paths_modified[fn] = fn_abs
if not paths_modified: if not paths_modified:
@@ -224,16 +225,15 @@ class bam_utils:
print("Now make a zipfile") print("Now make a zipfile")
import zipfile import zipfile
temp_zip = os.path.join(path, ".bam_tmp.zip") temp_zip = os.path.join(path, ".bam_tmp.zip")
with zipfile.ZipFile(temp_zip, 'w', zipfile.ZIP_DEFLATED) as zip: with zipfile.ZipFile(temp_zip, 'w', zipfile.ZIP_DEFLATED) as zip_handle:
for (fn, fn_abs) in paths_modified.items(): for (fn, fn_abs) in paths_modified.items():
print(" Archiving %r" % fn_abs) print(" Archiving %r" % fn_abs)
zip.write(fn_abs, zip_handle.write(fn_abs, arcname=fn)
arcname=fn)
# make a paths remap that only includes modified files # make a paths remap that only includes modified files
# TODO(cam), from 'packer.py' # TODO(cam), from 'packer.py'
def write_dict_as_json(fn, dct): def write_dict_as_json(fn, dct):
zip.writestr( zip_handle.writestr(
fn, fn,
json.dumps(dct, json.dumps(dct,
check_circular=False, check_circular=False,