|
|
|
@ -65,7 +65,7 @@ class Cache():
|
|
|
|
|
else:
|
|
|
|
|
patch_template = False
|
|
|
|
|
for fname, pkg in self.reMerge.findall(data):
|
|
|
|
|
pkg = pkg or get_pkgname_by_filename(fn)
|
|
|
|
|
pkg = pkg or get_pkgname_by_filename(fn).encode("UTF-8")
|
|
|
|
|
yield (self.PATCH_TYPE if patch_template
|
|
|
|
|
else self.MERGE_TYPE, pkg)
|
|
|
|
|
|
|
|
|
@ -78,7 +78,7 @@ class Cache():
|
|
|
|
|
if x.endswith(self.CLT_SUFFIX)):
|
|
|
|
|
data = readFile(fn, binary=True)
|
|
|
|
|
for fname, pkg in self.reMerge.findall(data):
|
|
|
|
|
pkg = pkg or get_pkgname_by_filename(fn)
|
|
|
|
|
pkg = pkg or get_pkgname_by_filename(fn).encode("UTF-8")
|
|
|
|
|
yield (self.MERGE_TYPE, pkg)
|
|
|
|
|
|
|
|
|
|
@staticmethod
|
|
|
|
@ -115,4 +115,4 @@ class Cache():
|
|
|
|
|
with writeFile(self.fn_patch, binary=True) as f:
|
|
|
|
|
f.write(b"\n".join(list_packages))
|
|
|
|
|
with writeFile(self.fn_mtime, binary=True) as f:
|
|
|
|
|
f.write(bytes(time.time()))
|
|
|
|
|
f.write(str(time.time()).encode("UTF-8"))
|
|
|
|
|