From 46016fa153f32e69527d0e269449bbfa0046a84c Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Sun, 13 Apr 2014 07:32:32 +0200
Subject: [PATCH] autoupdate fails to download latest release (1.71) due to
 default release blacklist - removed the default version blacklist regex from
 init (for future versions)

!!!  left existing update  blacklist setting untouched !!!
(existing installation wanting autoupdate for 1.71 need to change blacklist in ConfigUpdate_p.html)

- moved old blacklist patch to migration.java
---
 defaults/yacy.init                               | 2 +-
 source/net/yacy/migration.java                   | 6 ++++++
 source/net/yacy/peers/operation/yacyRelease.java | 9 ++-------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/defaults/yacy.init b/defaults/yacy.init
index 3266ffff8..ccc19c77f 100644
--- a/defaults/yacy.init
+++ b/defaults/yacy.init
@@ -130,7 +130,7 @@ update.cycle = 168
 # a version number blacklist can restrict automatic or guided updates to a specific
 # range of version numbers. The restriction is done with a blacklist (standard regexpr)
 # It is recommended to set this list to low developer version numbers
-update.blacklist = ...[123]
+update.blacklist = 
 # a update can also restricted with a concept property, which can decide if an
 # update is only valid if it either is a main release or any release including new development releases
 # Valid keywords are 'main' and 'any'
diff --git a/source/net/yacy/migration.java b/source/net/yacy/migration.java
index e19da7ce6..ad32d49e1 100644
--- a/source/net/yacy/migration.java
+++ b/source/net/yacy/migration.java
@@ -277,6 +277,12 @@ public class migration {
             sb.setConfig("crawler.http.acceptLanguage", sb.getConfig("crawler.acceptLanguage","en-us,en;q=0.5"));
             sb.setConfig("crawler.http.acceptCharset",  sb.getConfig("crawler.acceptCharset","ISO-8859-1,utf-8;q=0.7,*;q=0.7"));
         }
+
+        // patch the blacklist because of a release strategy change from 0.7 and up
+        if ((value = sb.getConfig("update.blacklist","")).equals("....[123]")) {
+            value = ""; // no default (remove prev. setting "...[123]" as it hits "1.71" release, added 2014-04-13)
+            sb.setConfig("update.blacklist", value);
+        }
     }
     
     /**
diff --git a/source/net/yacy/peers/operation/yacyRelease.java b/source/net/yacy/peers/operation/yacyRelease.java
index 2714e1a9a..1f3094ec7 100644
--- a/source/net/yacy/peers/operation/yacyRelease.java
+++ b/source/net/yacy/peers/operation/yacyRelease.java
@@ -132,12 +132,7 @@ public final class yacyRelease extends yacyVersion {
         final yacyRelease latestmain = (releases.main.isEmpty()) ? null : releases.main.last();
         final yacyRelease latestdev  = (releases.dev.isEmpty()) ? null : releases.dev.last();
         final String concept = sb.getConfig("update.concept", "any");
-        String blacklist = sb.getConfig("update.blacklist", "...[123]");
-        if (blacklist.equals("....[123]")) {
-            // patch the blacklist because of a release strategy change from 0.7 and up
-            blacklist = "...[123]";
-            sb.setConfig("update.blacklist", blacklist);
-        }
+        String blacklist = sb.getConfig("update.blacklist", "");
 
         if ((manual) || (concept.equals("any"))) {
             // return a dev-release or a main-release
@@ -151,7 +146,7 @@ public final class yacyRelease extends yacyVersion {
                             " is not more recent than installed release " + thisVersion().getName());
                     return null;
                 }
-                return latestdev;
+               return latestdev;
             }
             if (latestmain != null) {
                 // consider a main release