Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug fix: was crashing when sqlite3 is not installed #2300

Merged
merged 1 commit into from
Aug 20, 2012
Merged

bug fix: was crashing when sqlite3 is not installed #2300

merged 1 commit into from
Aug 20, 2012

Conversation

benjiec
Copy link
Contributor

@benjiec benjiec commented Aug 13, 2012

sqlite3 is None if sqlite3 is not installed. sqlite3.connection was used in db_changed method in history/core.py

@travisbot
Copy link

This pull request passes (merged 87fae0e9 into 9e49929).

@minrk
Copy link
Member

minrk commented Aug 13, 2012

This got a little convoluted with duplicate commits and an inappropriate merge. Can you clean that up?

Should be as simple as:

git reset 6135e77 --hard
git push -f

If I read this correctly.

@benjiec
Copy link
Contributor Author

benjiec commented Aug 13, 2012

Sorry, done. Next time I will just do this on a branch.

Benjie

On Mon, Aug 13, 2012 at 2:52 PM, Min RK notifications@github.com wrote:

This got a little convoluted with duplicate commits and an inappropriate
merge. Can you clean that up?

Should be as simple as:

git reset 6135e77 --hard
git push -f

If I read this correctly.


Reply to this email directly or view it on GitHubhttps://github.com//pull/2300#issuecomment-7703372.

@travisbot
Copy link

This pull request passes (merged 6135e77 into 9e49929).

@takluyver
Copy link
Member

Looks OK to me. @minrk, any thoughts before we merge this?

@minrk
Copy link
Member

minrk commented Aug 20, 2012

nope, go ahead. It was only the mixed up commits, but it's fine now.

takluyver added a commit that referenced this pull request Aug 20, 2012
bug fix: was crashing when sqlite3 is not installed
@takluyver takluyver merged commit 3c8d448 into ipython:master Aug 20, 2012
@takluyver
Copy link
Member

Great. In it goes.

mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
bug fix: was crashing when sqlite3 is not installed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants