|
 |
d4a07df |
diff -up sage-5.12/spkg/build/sage-5.12/sage/databases/cremona.py.orig sage-5.12/spkg/build/sage-5.12/sage/databases/cremona.py
|
|
|
d4a07df |
--- sage-5.12/spkg/build/sage-5.12/sage/databases/cremona.py.orig 2013-02-22 17:33:50.579875129 -0300
|
|
|
d4a07df |
+++ sage-5.12/spkg/build/sage-5.12/sage/databases/cremona.py 2013-02-22 17:34:05.051875683 -0300
|
|
|
86f823b |
@@ -889,14 +889,9 @@ class MiniCremonaDatabase(SQLDatabase):
|
|
|
86f823b |
if N < self.largest_conductor():
|
|
|
86f823b |
message = "There is no elliptic curve with label " + label \
|
|
|
86f823b |
+ " in the database"
|
|
|
86f823b |
- elif is_package_installed('database_cremona_ellcurve'):
|
|
|
86f823b |
- message = "There is no elliptic curve with label " + label \
|
|
|
86f823b |
- + " in the currently available databases"
|
|
|
86f823b |
else:
|
|
|
86f823b |
message = "There is no elliptic curve with label " \
|
|
|
86f823b |
- + label + " in the default database; try installing " \
|
|
|
86f823b |
- + "the optional package database_cremona_ellcurve which " \
|
|
|
86f823b |
- + "contains the complete Cremona database"
|
|
|
86f823b |
+ + label + " in the default database"
|
|
|
86f823b |
raise ValueError(message)
|
|
|
86f823b |
|
|
|
86f823b |
def iter(self, conductors):
|
|
|
86f823b |
@@ -1594,10 +1589,12 @@ def CremonaDatabase(name=None,mini=None,
|
|
|
86f823b |
if name is None and not set_global:
|
|
|
86f823b |
return _db
|
|
|
86f823b |
if set_global and name is None:
|
|
|
86f823b |
- if is_package_installed('database_cremona_ellcurve'):
|
|
|
86f823b |
- name = 'cremona'
|
|
|
86f823b |
- else:
|
|
|
86f823b |
- name = 'cremona mini'
|
|
|
86f823b |
+ # currently the sagemath rpm package only installs cremona mini
|
|
|
86f823b |
+ #if is_package_installed('database_cremona_ellcurve'):
|
|
|
86f823b |
+ # name = 'cremona'
|
|
|
86f823b |
+ #else:
|
|
|
86f823b |
+ # name = 'cremona mini'
|
|
|
86f823b |
+ name = 'cremona mini'
|
|
|
86f823b |
if name == 'cremona':
|
|
|
86f823b |
mini = False
|
|
|
86f823b |
elif name == 'cremona mini':
|