Skip to content

Commit e7585dc

Browse files
Allow frozen specs like "<__phello__.*> : __phello_partial__".
1 parent 8da9960 commit e7585dc

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Tools/scripts/freeze_modules.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,15 @@ def parse_frozen_specs(sectionalspecs=FROZEN, destdir=None):
138138
seen = {}
139139
for section, specs in sectionalspecs:
140140
parsed = _parse_specs(specs, section, seen)
141-
for frozenid, pyfile, modname, ispkg, section in parsed:
141+
for item in parsed:
142+
frozenid, pyfile, modname, ispkg, section = item
142143
try:
143144
source = seen[frozenid]
144145
except KeyError:
145146
source = FrozenSource.from_id(frozenid, pyfile, destdir)
146147
seen[frozenid] = source
147148
else:
148-
assert not pyfile
149+
assert not pyfile or pyfile == source.pyfile, item
149150
yield FrozenModule(modname, ispkg, section, source)
150151

151152

@@ -227,7 +228,6 @@ def _parse_spec(spec, knownids=None, section=None):
227228
pkgfiles = {pyfile: pkgid}
228229
def iter_subs():
229230
for frozenid, pyfile, ispkg in resolved:
230-
assert not knownids or frozenid not in knownids, (frozenid, spec)
231231
if pkgname:
232232
modname = frozenid.replace(pkgid, pkgname, 1)
233233
else:

0 commit comments

Comments
 (0)