billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use apt_pkg function.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-16 18:28:53 +00:00
parent 79de95e787
commit 09d74cf827
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ognibuild/debian/file_search.py
View file

@ -16,6 +16,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import apt_pkg
from datetime import datetime
import os
import re
@ -41,12 +42,6 @@ def read_contents_file(f):
yield path, rest
def url_to_cache_filename(url):
from urllib.parse import urlparse
parsed = urlparse(url)
return parsed.hostname + parsed.path.replace("/", "_")
def contents_urls_from_sourceslist(sl, arch):
# TODO(jelmer): Verify signatures, etc.
arches = [(arch, True), ("all", False)]
@ -116,7 +111,7 @@ def load_contents_url(url):
def load_apt_cache_file(cache_dir, url):
fn = url_to_cache_filename(url)
fn = apt_pkg.uri_to_filename(url)
p = os.path.join(cache_dir, fn + ".lz4")
if not os.path.exists(p):
return None