mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 03:39:03 -04:00
36 lines
1.7 KiB
Diff
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-02-07 12:35:15.971835685 -0200
|
|
+++ src/sage/databases/cremona.py 2014-02-07 12:35:25.242836040 -0200
|
|
@@ -886,14 +886,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)
|
|
|
|
def iter(self, conductors):
|
|
@@ -1591,10 +1586,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':
|