Merge branch 'bug_717802' into fork

src/zc/buildout/buildout.py

@@ -1389,6 +1389,8 @@ def _open(base, filename, seen, dl_options, override, downloaded):
     _dl_options = _unannotate_section(dl_options.copy())
     newest = _convert_bool('newest', _dl_options.get('newest', 'false'))
     fallback = newest and not (filename in downloaded)
+    if _isurl(base):
+      fallback = fallback and not (base + '/' + filename in downloaded)
     download = zc.buildout.download.Download(
         _dl_options, cache=_dl_options.get('extends-cache'),
         fallback=fallback, hash_name=True)

src/zc/buildout/extends-cache.txt

@@ -457,12 +457,18 @@ used:
 ... extends = %sbase.cfg
 ... bar = foo
 ... """ % server_url)
+>>> write(server_data, 'baseC.cfg', """\
+... [buildout]
+... extends-cache = cache
+... extends = baseB.cfg
+... bar = foo
+... """)
 >>> write('buildout.cfg', """\
 ... [buildout]
 ... extends-cache = cache
 ... newest = true
-... extends = %sbaseA.cfg %sbaseB.cfg
-... """ % (server_url, server_url))
+... extends = %sbaseA.cfg %sbaseB.cfg %sbaseC.cfg
+... """ % (server_url, server_url, server_url))
 >>> print system(buildout + " -n")
 Unused options for buildout: 'bar' 'foo'.
 
@@ -480,6 +486,7 @@ a better solution would utilise the logging already done by the utility.)
 The URL http://localhost/baseA.cfg was downloaded.
 The URL http://localhost/base.cfg was downloaded.
 The URL http://localhost/baseB.cfg was downloaded.
+The URL http://localhost/baseC.cfg was downloaded.
 Unused options for buildout: 'bar' 'foo'.
 
 >>> zc.buildout.download.Download.download = old_download