mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
bitbake: toaster: Amend regex for MySQL database URLs
The database URL detection doesn't admit a MySQL URL without a port. As this is a common case (e.g. you would set the HOST to a mysql.sock path if pointing at a local MySQL server, with no port setting), amend the regex so it will correctly recognise paths, as well as HOST:PORT URLs. (Bitbake rev: 89386aab888f806d5aa4a8083c06566e48d9445b) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
f001a4ac3c
commit
c464f34d5b
@@ -64,6 +64,7 @@ if 'sqlite' in DATABASES['default']['ENGINE']:
|
||||
|
||||
if 'DATABASE_URL' in os.environ:
|
||||
dburl = os.environ['DATABASE_URL']
|
||||
|
||||
if dburl.startswith('sqlite3://'):
|
||||
result = re.match('sqlite3://(.*)', dburl)
|
||||
if result is None:
|
||||
@@ -78,7 +79,7 @@ if 'DATABASE_URL' in os.environ:
|
||||
}
|
||||
elif dburl.startswith('mysql://'):
|
||||
# URL must be in this form: mysql://user:pass@host:port/name
|
||||
result = re.match(r"mysql://([^:]*):([^@]*)@([^:]*):(\d+)/([^/]*)", dburl)
|
||||
result = re.match(r"mysql://([^:]*):([^@]*)@([^:]*):(\d*)/([^/]*)", dburl)
|
||||
if result is None:
|
||||
raise Exception("ERROR: Could not read mysql database url: %s" % dburl)
|
||||
DATABASES['default'] = {
|
||||
|
||||
Reference in New Issue
Block a user