Merge remote-tracking branch 'origin/Develop' into Develop
# Conflicts: # cps/updater.py
This commit is contained in:
commit
134a10f56c
|
@ -42,5 +42,4 @@ var reader;
|
|||
alert(error);
|
||||
});
|
||||
}
|
||||
// reader.book.package.metadata.direction= "rtl"; wait for reader reader before changing reading direction
|
||||
})();
|
||||
|
|
|
@ -198,7 +198,7 @@ class Updater(threading.Thread):
|
|||
)
|
||||
additional_path = self.is_venv()
|
||||
if additional_path:
|
||||
exclude = exclude + (additional_path)
|
||||
exclude = exclude + (additional_path,)
|
||||
for root, dirs, files in os.walk(destination, topdown=True):
|
||||
for name in files:
|
||||
old_list.append(os.path.join(root, name).replace(destination, ''))
|
||||
|
|
Loading…
Reference in New Issue
Block a user