Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
2ff3fc6a
Commit
2ff3fc6a
authored
12 years ago
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1576 from vanne/devel
Fix exception catching for Python 2.4
parents
325025a5
e9a356bb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
library/mysql_db
+1
-1
library/mysql_user
+1
-1
No files found.
library/mysql_db
View file @
2ff3fc6a
...
...
@@ -192,7 +192,7 @@ def main():
else
:
db_connection
=
MySQLdb
.
connect
(
host
=
module
.
params
[
"login_host"
],
user
=
login_user
,
passwd
=
login_password
,
db
=
connect_to_db
)
cursor
=
db_connection
.
cursor
()
except
Exception
as
e
:
except
Exception
,
e
:
module
.
fail_json
(
msg
=
"unable to connect, check login_user and login_password are correct, or alternatively check ~/.my.cnf contains credentials"
)
changed
=
False
...
...
This diff is collapsed.
Click to expand it.
library/mysql_user
View file @
2ff3fc6a
...
...
@@ -283,7 +283,7 @@ def main():
else
:
db_connection
=
MySQLdb
.
connect
(
host
=
module
.
params
[
"login_host"
],
user
=
login_user
,
passwd
=
login_password
,
db
=
"mysql"
)
cursor
=
db_connection
.
cursor
()
except
Exception
as
e
:
except
Exception
,
e
:
module
.
fail_json
(
msg
=
"unable to connect to database, check login_user and login_password are correct or ~/.my.cnf has the credentials"
)
if
state
==
"present"
:
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment