Commit 134a10f5 authored by Ozzieisaacs's avatar Ozzieisaacs

Merge remote-tracking branch 'origin/Develop' into Develop

# Conflicts:
#	cps/updater.py
parents 372c284a 371097eb
......@@ -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, ''))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment