While the other IPR search resuls have special text for the 'no search result' case, document_search doesn.

 - Legacy-Id: 835

Author: levkowetz

ietf/idtracker/models.py

@@ -920,12 +920,3 @@ class DocumentWrapper(object):
     def __init__(self, document):
 	self.document = document
 
-class Test(TestCase):
-    def testDoctest(self):
-        # doctests in models.py will be automatically tested when running
-        # django's 'test' command, but for other modules we need to make a
-        # bit of extra effort to have doctests run.
-        #import doctest
-        #import templatetags.ietf_filters
-        #doctest.testmod(templatetags.ietf_filters)
-        pass

ietf/idtracker/tests.py

@@ -0,0 +1,11 @@
+import doctest
+import templatetags.ietf_filters
+
+class IDTrackerTest(TestCase):
+    def testDoctest(self):
+        # doctests in models.py will be automatically tested when running
+        # django's 'test' command, but for other modules we need to make a
+        # bit of extra effort to have doctests run.
+
+        #doctest.testmod(templatetags.ietf_filters)
+        pass

ietf/templates/ipr/search_doc_result.html

@@ -4,12 +4,6 @@
 {% block search_result %}
 	    <table cellpadding="1" cellspacing="0" border="0">
 
-	       {% if not iprs %}
-		  <tr>
-		     <td></td>
-		     <td colspan="2"><b>{% block search_failed %}No IPR disclosures were found related to <i>{{ doc }}</i>{% endblock %}</b></td>
-		  </tr>
-	       {% else %}
 		  <tr><td colspan="3">Total number of IPR disclosures found: {{ iprs|length }} </td></tr>
 		  {% for ipr in iprs|dictsort:"submitted_date" %}
 		  <tr valign="top" bgcolor="#dadada">
@@ -44,7 +38,6 @@
 		     {% endif %}
 		  </tbody>
 		  {% endfor %}
-	       {% endif %}
 
 	    </table>
 {% endblock %}

test/mkrelease

@@ -164,7 +164,7 @@ svn info $REPO/tags/$VER 2>&1 | grep -q "Not a valid URL" || die "The tag '$VER'
 note "  Ok"
 
 note "Verifying there's no uncommitted changes..."
-$do svn st | grep "^[AMCG] " && die "There seems to be uncommitted changes in this working copy"
+$do svn st | grep "^[AMGRD] " && die "There seems to be uncommitted changes in this working copy"
 
 note "\nUpdating the version info in $VERFILE and making sure'\$Rev\$' is Ok"
 $do sed -i -r -e "/^__version__/s/\"[.0-9]+(-dev)?\"/\"$VER\"/" \

test/update-db

@@ -25,14 +25,12 @@ for dir in $DBLOCK /var/lock /var/state /var/run /var/tmp; do
 done
 [ "$lock" ] || die "Couldn't find a directory to keep lock in."
 
-set -x
 [ "$DBDUMP" ] || DBDUMP="$1"
 [ "$DBDUMP" ] || DBDUMP=/www/tools.ietf.org/events/raw/sqldump/sqldump.raw
 [ "$DBFIX"  ] || DBFIX=$build/test/sql_fixup.sql
 [ "$DBTIME" ] || DBTIME=$state/update-db.time
 [ "$DBDONE" ] || DBDONE=$state/update-db.done
 [ "$DBLOCK" ] || DBLOCK=$lock
-set +x
 
 PIDFILE=$DBLOCK/pid
 
@@ -45,6 +43,7 @@ while true; do
 	#echo "Last update done $(date -r $DBDONE +'%Y-%m-%d %H:%M')."
 	if [ $DBDUMP -nt $DBTIME ]; then
 	    echo "Updating database dated $(date -r $DBDONE +'%Y-%m-%d %H:%M') from dump with time $(date -r $DBDUMP +'%Y-%m-%d %H:%M')"
+	    echo -n "Updating database from dump with time $(date -r $DBDUMP +'%Y-%m-%d %H:%M')... " 1>&2
 
 	    echo "$$" > $PIDFILE
 	    chmod a+rw $PIDFILE
@@ -58,6 +57,7 @@ while true; do
 	    touch -r $DBDUMP $DBTIME
 	    touch $DBDONE
 	    echo "Done."
+	    echo "Done." 1>&2
 	else
 	    echo "Database is up-to-date (updated $(date -r $DBDONE +'%Y-%m-%d %H:%M') from dump with time $(date -r $DBDUMP +'%Y-%m-%d %H:%M'))"
 	fi