From c464f34d5bd3aa4119aa3d1591ee7d55afe9b35f Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Wed, 9 Dec 2015 19:56:37 -0800 Subject: 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 Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastermain/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index 7c559bc7a1..b6bdcd8e3e 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py @@ -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'] = { -- cgit v1.2.3-54-g00ecf