Revert "ostree: introduce optional subpath feature"
This reverts commit 3bb5bedd8e as it
introduces problems in the caching system used by `osbuild` [1]
[1]: https://github.com/osbuild/osbuild/issues/2009
This commit is contained in:
parent
a6b64860b3
commit
b2ec2cd5ee
3 changed files with 8 additions and 49 deletions
|
|
@ -4,10 +4,8 @@ network related utilities
|
|||
"""
|
||||
import contextlib
|
||||
import http.server
|
||||
import os
|
||||
import socket
|
||||
import ssl
|
||||
import sys
|
||||
import threading
|
||||
|
||||
try:
|
||||
|
|
@ -27,12 +25,6 @@ except ImportError:
|
|||
from .atomic import AtomicCounter
|
||||
|
||||
|
||||
def print_dir(directory):
|
||||
for root, _, files in os.walk(directory):
|
||||
for fn in files:
|
||||
print(os.path.join(root, fn))
|
||||
|
||||
|
||||
def _get_free_port():
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
s.bind(("localhost", 0))
|
||||
|
|
@ -55,8 +47,6 @@ class SilentHTTPRequestHandler(http.server.SimpleHTTPRequestHandler):
|
|||
class DirHTTPServer(ThreadingHTTPServer):
|
||||
def __init__(self, *args, directory=None, simulate_failures=0, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
print("Serving:", file=sys.stderr)
|
||||
print_dir(directory)
|
||||
self.directory = directory
|
||||
self.simulate_failures = AtomicCounter(simulate_failures)
|
||||
self.reqs = AtomicCounter()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue