Ticket #10176: sagenb-0.8.7_vs._0.8.7.p1.diff

setup.py

@@ -21 +21 @@
     
 
 code = setup(name = 'sagenb',
-      version     = '0.8.7',  # the spkg-dist script assumes single quotes here
+      version     = '0.8.7.p1',  # the spkg-dist script assumes single quotes here
       description = 'The Sage Notebook',
       license     = 'GNU Public License (GPL) v2+',
       author      = 'William Stein et al.',

spkg-dist

@@ -42 +42 @@
 
 spkg_install = os.path.abspath(os.path.join(os.path.curdir, 'spkg-install'))
 spkg_install_fd = open(spkg_install, 'w')
-spkg_install_fd.write("cd src\n")
 
 shutil.copy(os.path.join(os.path.pardir, os.path.pardir, 'SPKG.txt'),
             os.path.curdir)
@@ -51 +50 @@
 
 def fetch_packages():
     # This block is here in case we ever need it again.
+    # XXX Then also make sure the easy_install commands
+    # XXX get written to the correct part of spkg-install!
+    # XXX (We currently use a single string for the whole file.)
     print "Fetching the required packages"
     pkg_index = PackageIndex()
 
@@ -75 +77 @@
 
 os.chdir(os.path.pardir)
 
-spkg_install_fd.write("""
+spkg_install_fd.write(
+r"""#!/usr/bin/env bash
+
+# spkg-install for SageNB, generated by SageNB's spkg-dist
+
+if [ -z "$SAGE_LOCAL" ]; then
+    echo "SAGE_LOCAL undefined - exiting..."
+    exit 1
+fi
+
+cd src
+
 cd sagenb
 python setup.py install
+if [ $? -ne 0 ]; then
+    echo "Error running setup.py install"
+    exit 1
+fi
 
 mkdir -p "$SAGE_ROOT/devel"
 
 echo "Copying SageNB package to '$SAGE_ROOT/devel/sagenb-main'."
 if [ -d "$SAGE_ROOT/devel/sagenb-main" ]; then
-  echo "Copying old SageNB package to '$SAGE_ROOT/devel/sagenb-main-old'."
-  rm -rf "$SAGE_ROOT/devel/sagenb-main-old"
-  cp -pr "$SAGE_ROOT/devel/sagenb-main" "$SAGE_ROOT/devel/sagenb-main-old"
+    echo "Moving old SageNB package to '$SAGE_ROOT/devel/sagenb-main-old'."
+    rm -rf "$SAGE_ROOT/devel/sagenb-main-old"
+    mv "$SAGE_ROOT/devel/sagenb-main" "$SAGE_ROOT/devel/sagenb-main-old"
 fi
 
-rm -f "$SAGE_ROOT/devel/sagenb"
+# Rather than copying, we now use 'mv' above, so nothing to delete here:
+# rm -rf "$SAGE_ROOT/devel/sagenb" # Should point to sagenb-main if it exists
 
 cd ..
 cp -pr sagenb "$SAGE_ROOT/devel/sagenb-main"
@@ -99 +117 @@
 # We use relative paths for relocatability.
 cd "$SAGE_ROOT/devel/sagenb"
 python setup.py develop --egg-path ../../../../devel/sagenb
+if [ $? -ne 0 ]; then
+    echo "Error running setup.py develop"
+    exit 1
+fi
 
 cd "$SAGE_ROOT/local/lib/python/site-packages"
-sed 's/^.*sagenb.*$/..\/..\/..\/..\/devel\/sagenb/' easy-install.pth > easy-install.pth.new
-mv -f easy-install.pth.new easy-install.pth
+# Dave says Solaris' non-POSIX grep in the default path
+# doesn't understand "-q" (which *is* POSIX):
+if ! grep sagenb easy-install.pth >/dev/null; then
+    # Ugly work-around, we haven't found the real cause yet (see #10176):
+    echo 'No sagenb path found in easy-install.pth!'
+    echo "Adding relative sagenb path to easy-install.pth"
+    sed -e '$ i \../../../../devel/sagenb' easy-install.pth > easy-install.pth.$$
+    if [ $? -ne 0 ]; then
+        echo "Error adding relative sagenb path to easy-install.pth"
+        exit 1
+    fi
+else
+    echo "Making sagenb path in easy-install.pth relative"
+    sed 's/^.*sagenb.*$/..\/..\/..\/..\/devel\/sagenb/' easy-install.pth > easy-install.pth.$$
+    if [ $? -ne 0 ]; then
+        echo "Error patching easy-install.pth to have relative path to SageNB"
+        exit 1
+    fi
+fi
+if true; then # DEBUG (cf. #10176)
+    echo "Old path: \"`grep sagenb easy-install.pth`\""
+    echo "New path: \"`grep sagenb easy-install.pth.$$`\""
+fi
+# The following fails only on wrong file permissions etc.:
+mv -f easy-install.pth.$$ easy-install.pth
+if [ $? -ne 0 ]; then
+    echo "Error overwriting original easy-install.pth"
+    exit 1
+fi
 """)
 spkg_install_fd.close()
 os.chmod(spkg_install, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP |