Rev4086, Fix verify content.json files without files_optional
This commit is contained in:
parent
327f580218
commit
fd085d2d37
2 changed files with 3 additions and 3 deletions
|
@ -13,7 +13,7 @@ class Config(object):
|
||||||
|
|
||||||
def __init__(self, argv):
|
def __init__(self, argv):
|
||||||
self.version = "0.7.0"
|
self.version = "0.7.0"
|
||||||
self.rev = 4085
|
self.rev = 4086
|
||||||
self.argv = argv
|
self.argv = argv
|
||||||
self.action = None
|
self.action = None
|
||||||
self.pending_changes = {}
|
self.pending_changes = {}
|
||||||
|
|
|
@ -151,7 +151,7 @@ class ContentManager(object):
|
||||||
deleted, renamed = self.getFileChanges(old_files, new_files)
|
deleted, renamed = self.getFileChanges(old_files, new_files)
|
||||||
|
|
||||||
for relative_path_old, relative_path_new in renamed.items():
|
for relative_path_old, relative_path_new in renamed.items():
|
||||||
if relative_path_new in new_content.get("files_optional"):
|
if relative_path_new in new_content.get("files_optional", {}):
|
||||||
self.optionalRenamed(content_inner_dir + relative_path_old, content_inner_dir + relative_path_new)
|
self.optionalRenamed(content_inner_dir + relative_path_old, content_inner_dir + relative_path_new)
|
||||||
if self.site.storage.isFile(relative_path_old):
|
if self.site.storage.isFile(relative_path_old):
|
||||||
try:
|
try:
|
||||||
|
@ -1032,4 +1032,4 @@ class ContentManager(object):
|
||||||
return done
|
return done
|
||||||
|
|
||||||
def optionalRenamed(self, inner_path_old, inner_path_new):
|
def optionalRenamed(self, inner_path_old, inner_path_new):
|
||||||
return True
|
return True
|
||||||
|
|
Loading…
Reference in a new issue