Merge pull request #1496 from jzelinskie/ripRMS
dockerfile: add check for GPL pip packages
This commit is contained in:
commit
2317938bfa
6 changed files with 79 additions and 31 deletions
|
@ -1,12 +1,13 @@
|
|||
""" Create, list, cancel and get status/logs of repository builds. """
|
||||
|
||||
from urlparse import urlparse
|
||||
|
||||
import logging
|
||||
import json
|
||||
import datetime
|
||||
import hashlib
|
||||
|
||||
from flask import request
|
||||
from rfc3987 import parse as uri_parse
|
||||
|
||||
from app import userfiles as user_files, build_logs, log_archive, dockerfile_build_queue
|
||||
from buildtrigger.basehandler import BuildTriggerHandler
|
||||
|
@ -229,14 +230,14 @@ class RepositoryBuildList(RepositoryParamResource):
|
|||
if archive_url:
|
||||
archive_match = None
|
||||
try:
|
||||
archive_match = uri_parse(archive_url, 'URI')
|
||||
archive_match = urlparse(archive_url)
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
if not archive_match:
|
||||
raise InvalidRequest('Invalid Archive URL: Must be a valid URI')
|
||||
|
||||
scheme = archive_match.get('scheme', None)
|
||||
scheme = archive_match.scheme
|
||||
if scheme != 'http' and scheme != 'https':
|
||||
raise InvalidRequest('Invalid Archive URL: Must be http or https')
|
||||
|
||||
|
|
Reference in a new issue