bugfix: NNTP 480 error.
diff --git a/alien/src/fmsutil/FMSConnection.java b/alien/src/fmsutil/FMSConnection.java --- a/alien/src/fmsutil/FMSConnection.java +++ b/alien/src/fmsutil/FMSConnection.java @@ -67,6 +67,11 @@ class FMSConnection extends NNTPConnecti send(String.format("XGETTRUST %s %s", trustKindToString(kind), fmsId)); String reply = read(); StatusResponse response = parseResponse(reply, false); + if (response.getStatus() == 480) { + // This happens for deleted identities in FMS. + // 480 Identity not found + return -1; + } if (response.getStatus() < 200 || response.getStatus() > 299) { throw new IOException("XGETTRUST NNTP request failed: " + reply); } diff --git a/doc/latest_release.txt b/doc/latest_release.txt --- a/doc/latest_release.txt +++ b/doc/latest_release.txt @@ -1,3 +1,8 @@ +Fixed bug that was causing "Discover" to fail with an +"Error reading log: XGETTRUST NNTP request failed: 480 Identity not found" error +message on FMS. This only happened for deleted identities. + +da5f54f86710 Fixed a bug in the display of '-' that was causing horizontal lines to be rendered incorrectly on the "Discover" page. diff --git a/readme.txt b/readme.txt --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -20110611 +20110621 djk@isFiaD04zgAgnrEC5XJt1i4IE7AkNPqhBG5bONi6Yks WARNING: @@ -84,6 +84,8 @@ sethcg@a-tin0kMl1I~8xn5lkQDqYZRExKLzJITr --- Dev notes --- +BUG: "Error reading log: XGETTRUST NNTP request failed: 480 Identity not found" in Discover for deleted + identities on FMS. [Already fixed.] BUG: fix the discover UI to correctly handle posts from a different nym than the insert BUG: wikitext should use unix line terminators not DOS (+1 byte per line) BUG: MUST show in the UI when edited wikitext has been truncated because it's too big. diff --git a/release/cut_release.py b/release/cut_release.py --- a/release/cut_release.py +++ b/release/cut_release.py @@ -32,7 +32,6 @@ import os import shutil import subprocess -import tarfile from binascii import hexlify @@ -69,9 +68,9 @@ PUBLIC_SITE = "USK@kRM~jJVREwnN2qnA8R0Vt ############################################################ # Indexes of referenced USK sites -FREENET_DOC_WIKI_IDX = 40 -FNIKI_IDX = 84 -REPO_IDX = 18 +FREENET_DOC_WIKI_IDX = 56 +FNIKI_IDX = 85 +REPO_IDX = 19 ############################################################