sagemath/sagemath-cremona.patch
2014-12-13 21:05:42 -02:00

36 lines
1.7 KiB
Diff

diff -up src/sage/databases/cremona.py.orig src/sage/databases/cremona.py
--- src/sage/databases/cremona.py.orig 2014-11-18 15:26:03.247128579 -0200
+++ src/sage/databases/cremona.py 2014-11-18 15:26:16.920128759 -0200
@@ -819,14 +819,9 @@ class MiniCremonaDatabase(SQLDatabase):
if N < self.largest_conductor():
message = "There is no elliptic curve with label " + label \
+ " in the database"
- elif is_package_installed('database_cremona_ellcurve'):
- message = "There is no elliptic curve with label " + label \
- + " in the currently available databases"
else:
message = "There is no elliptic curve with label " \
- + label + " in the default database; try installing " \
- + "the optional package database_cremona_ellcurve which " \
- + "contains the complete Cremona database"
+ + label + " in the default database"
raise ValueError(message)
ainvs = eval(c[0])
data = {'cremona_label': label,
@@ -1669,10 +1664,12 @@ def CremonaDatabase(name=None,mini=None,
if name is None and not set_global:
return _db
if set_global and name is None:
- if is_package_installed('database_cremona_ellcurve'):
- name = 'cremona'
- else:
- name = 'cremona mini'
+ # currently the sagemath rpm package only installs cremona mini
+ #if is_package_installed('database_cremona_ellcurve'):
+ # name = 'cremona'
+ #else:
+ # name = 'cremona mini'
+ name = 'cremona mini'
if name == 'cremona':
mini = False
elif name == 'cremona mini':