mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
fix whitespace transformation issues
This commit is contained in:
parent
cd305a44b5
commit
0d09162722
1 changed files with 10 additions and 4 deletions
14
publish.py
14
publish.py
|
|
@ -68,6 +68,7 @@ class PatchInfo:
|
||||||
def output(self, line):
|
def output(self, line):
|
||||||
if self.debug:
|
if self.debug:
|
||||||
print("Dry run: {}".format(line.rstrip()))
|
print("Dry run: {}".format(line.rstrip()))
|
||||||
|
# pass
|
||||||
else:
|
else:
|
||||||
self.file.write(line)
|
self.file.write(line)
|
||||||
|
|
||||||
|
|
@ -167,17 +168,22 @@ class PatchInfo:
|
||||||
if 'path' not in line:
|
if 'path' not in line:
|
||||||
self.output(line) # already remote, nothing to do
|
self.output(line) # already remote, nothing to do
|
||||||
else:
|
else:
|
||||||
if 'package' in line:
|
if '{' in line and ',' in line:
|
||||||
specs = re.split(',|}|{', line) # line.split(',')
|
specs = re.split(',|}|{', line) # line.split(',')
|
||||||
for spec in specs:
|
for spec in specs:
|
||||||
if 'path' in spec:
|
if 'path' in spec:
|
||||||
oldpath = spec
|
oldpath = spec.rstrip().lstrip()
|
||||||
if oldpath is None:
|
if oldpath is None:
|
||||||
print("Error! couldn't parse out path to substitute for dependency {}".format(depcrate))
|
print("Error! couldn't parse out path to substitute for dependency {}".format(depcrate))
|
||||||
newver = ' version = "{}" '.format(VERSIONS[depcrate])
|
newver = 'version = "{}"'.format(VERSIONS[depcrate])
|
||||||
(newline, numsubs) = re.subn(oldpath, newver, line)
|
(newline, numsubs) = re.subn(oldpath, newver, line)
|
||||||
if numsubs != 1 and not "\"*\"" in newline:
|
if numsubs != 1 and not "\"*\"" in newline:
|
||||||
print("Warning! Path substitution failed for {}:{} in crate {} ({})".format(depcrate, oldver, this_crate, numsubs))
|
print("Warning! Path substitution failed for {}:{} in crate {} ({})".format(depcrate, oldpath, this_crate, numsubs))
|
||||||
|
else:
|
||||||
|
# print("Substitute {}:{} in crate {} ({})".format(depcrate, oldpath, this_crate, newver))
|
||||||
|
# print(" " + oldpath)
|
||||||
|
# print(" " + newline)
|
||||||
|
pass
|
||||||
self.output(newline)
|
self.output(newline)
|
||||||
else:
|
else:
|
||||||
self.output('{} = "{}"\n'.format(depcrate, VERSIONS[depcrate]))
|
self.output('{} = "{}"\n'.format(depcrate, VERSIONS[depcrate]))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue