This is the mail archive of the cygwin-apps mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Is it my setup or the mirror page that is wrong as to the current status of a mirror


Brian Keener wrote:
> these line at the end of the mirrors-lst file:
> 
> # Following mirrors re-added by setup.exe to warn again about dropped urls.
> ftp://sourceware.mirrors.tds.net/pub/sourceware.org/cygwin;sourceware.mirro
> rs.tds.net;North America;Wisconsin
> 
> If I remove these line then the mirror check proceeds as normal and no 
> warning occurs.  I looked at my Windows 2000 machine and found a similar 
> line for the gatech mirror which when removed from the mirror-lst file the 
> warning goes away in setup on that machine as well.  I then left the line 
> there and started setup and the line stays with the updated mirrors-lst 
> file leading me to believe that setup is copying those lines each time from 
> the old mirrors-lst file to the new.  My hunch is that at some point that 
> line got in the mirror-lst file because the mirror was out of date and then 
> each time I get the warning dialog I respond to Yes I want to continue 
> using the mirror and I do not check "do not warn me again".  My guess is 
> that I get the warning because the lines are there and that setup does not 
> reaffirm that the lines need to be there.

These lines patched into site.cc seem to fix the above problem.  Not sure why it 
keep insisting on leaving the line there in mirrors-lst but this patch causes a 
double check so that mirror gets cleaned up and doesn't keep warning you even when 
the mirror is current again:

Index: site.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/site.cc,v
retrieving revision 2.44
diff -u -p -r2.44 site.cc
--- site.cc     8 Apr 2008 23:50:54 -0000       2.44
+++ site.cc     5 Sep 2008 20:13:48 -0000
@@ -501,13 +501,21 @@ int check_dropped_mirrors (HWND h)
          SiteList::iterator j = find (cached_site_list.begin(),
                                       cached_site_list.end(), *n);
          if (j != cached_site_list.end())
-           {
-             log (LOG_PLAIN) << "Dropped selected mirror: " << n->url
-                 << endLog;
-             dropped_site_list.push_back (*j);
-             cache_warn_urls += i->url;
+           {
+              SiteList::iterator d = find (all_site_list.begin(), all_site_list
.end(),*j);
+              if (d != all_site_list.end() || d->servername.size())
+              {
+              {
+               log (LOG_PLAIN) << "Should reinstate "<< n->url << " and remove
from dropped mirror list" << endLog;
+             }
+             else
+             {
+               log (LOG_PLAIN) << "Dropped selected mirror: " << n->url
+                   << endLog;
+               dropped_site_list.push_back (*j);
+               if (cache_warn_urls.size())
+                 cache_warn_urls += "\r\n";
+               cache_warn_urls += i->url;
+             }
            }
        }
     }




Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]