alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

stream_layered_image: Use pathlib module for directory traversal

Browse source
This commit is contained in:
Utku Demir 2020-06-22 15:11:04 +12:00
parent 16199521ea
commit fa8f2bf34f
No known key found for this signature in database
GPG key ID: F3F8629C3E0BF60B
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/build-support/docker/stream_layered_image.py
View file

@ -37,8 +37,8 @@ import re
import sys
import json
import hashlib
import pathlib
import tarfile
import itertools
import threading
from datetime import datetime
from collections import namedtuple
@ -90,18 +90,17 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None):
ti = tar.gettarinfo(os.path.join("/", path))
tar.addfile(apply_filters(append_root(ti)))
for root, dirs, files in os.walk(path, topdown=True):
for name in itertools.chain(dirs, files):
name = os.path.join(root, name)
ti = append_root(tar.gettarinfo(name))
for filename in pathlib.Path(path).rglob("*"):
ti = append_root(tar.gettarinfo(filename))
# copy hardlinks as regular files
if ti.islnk():
ti.type = tarfile.REGTYPE
ti.linkname = ""
ti = apply_filters(ti)
if ti.isfile():
with open(name, "rb") as f:
with open(filename, "rb") as f:
tar.addfile(ti, f)
else:
tar.addfile(ti)