diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2019-06-02 16:08:33 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2019-06-05 13:42:57 +0300 |
| commit | 67c8cfe73eb665685f4bc82ba4297d0c48d81e93 (patch) | |
| tree | 4e5a1227b0fb6c2de80ca4868b1165c23f922b46 /calm/pkg2html.py | |
| parent | 9d0d2ba77b13b7a95755c631ddda65065a121d50 (diff) | |
Store path to tar file in Tar object
Diffstat (limited to 'calm/pkg2html.py')
| -rwxr-xr-x | calm/pkg2html.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/calm/pkg2html.py b/calm/pkg2html.py index c12d811..9370092 100755 --- a/calm/pkg2html.py +++ b/calm/pkg2html.py @@ -333,8 +333,8 @@ def write_arch_listing(args, packages, arch): listings = os.listdir(dir) listings.remove('.htaccess') - for t in itertools.chain.from_iterable([packages[p].tars[vr] for vr in packages[p].tars]): - fver = re.sub(r'\.tar.*$', '', t) + for tn, to in itertools.chain.from_iterable([packages[p].tars[vr].items() for vr in packages[p].tars]): + fver = re.sub(r'\.tar.*$', '', tn) listing = os.path.join(dir, fver) # ... if it doesn't already exist, or force @@ -365,7 +365,7 @@ def write_arch_listing(args, packages, arch): <h1>%s</h1> <pre>''' % (header, header)), file=f) - tf = os.path.join(args.rel_area, packages[p].path, t) + tf = os.path.join(args.rel_area, to.path, to.fn) if not os.path.exists(tf): # this shouldn't happen with a full mirror logging.error("tarfile %s not found" % (tf)) |