projects
/
cumulus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rework uri_encode/uri_decode to more cleanly work with bytes/strings.
[cumulus.git]
/
python
/
cumulus
/
rebuild_database.py
diff --git
a/python/cumulus/rebuild_database.py
b/python/cumulus/rebuild_database.py
index
3f391d8
..
4ab580f
100755
(executable)
--- a/
python/cumulus/rebuild_database.py
+++ b/
python/cumulus/rebuild_database.py
@@
-40,6
+40,7
@@
import tarfile
import time
import cumulus
import time
import cumulus
+from cumulus import util
CHECKSUM_ALGORITHM = "sha224"
CHUNKER_PROGRAM = "cumulus-chunker-standalone"
CHECKSUM_ALGORITHM = "sha224"
CHUNKER_PROGRAM = "cumulus-chunker-standalone"
@@
-419,8
+420,8
@@
class SegmentStateRebuilder(object):
data_size += tarinfo.size
object_count += 1
data_size += tarinfo.size
object_count += 1
- return {"segment":
cumulus.uri_encod
e(segment_name),
- "path":
cumulus.uri_encod
e(relative_path),
+ return {"segment":
util.uri_encode_pathnam
e(segment_name),
+ "path":
util.uri_encode_pathnam
e(relative_path),
"checksum": checksum,
"data_size": data_size,
"disk_size": disk_size,
"checksum": checksum,
"data_size": data_size,
"disk_size": disk_size,