fixing empty lines and comments in apt.txt

pull/151/head
Gladys Nalvarte 2017-11-29 10:30:31 +01:00 zatwierdzone przez Min RK
rodzic fd740437e1
commit 82b0275a29
2 zmienionych plików z 15 dodań i 8 usunięć

Wyświetl plik

@ -418,13 +418,19 @@ class BaseImage(BuildPack):
assemble_scripts = []
try:
with open(self.binder_path('apt.txt')) as f:
extra_apt_packages = [l.strip() for l in f]
extra_apt_packages = []
for l in f:
package = l.partition('#')[0].strip()
if not package:
continue
# Validate that this is, indeed, just a list of packages
# We're doing shell injection around here, gotta be careful.
# FIXME: Add support for specifying version numbers
for p in extra_apt_packages:
if not re.match(r"^[a-z0-9.+-]+", p):
raise ValueError("Found invalid package name {} in apt.txt".format(p))
if not re.match(r"^[a-z0-9.+-]+", package):
raise ValueError("Found invalid package name {} in apt.txt".format(package))
extra_apt_packages.append(package)
assemble_scripts.append((
'root',

Wyświetl plik

@ -1 +1,2 @@
# testing to skip comments in this file
gfortran