# HG changeset patch # User "Yann E. MORIN" # Date 1306796256 -7200 # Node ID feee36c11ccc819fecf994a76b7bd46ef9442417 # Parent b0eac00569428be7cf62378b77ad1d414995d6b0 scripts/functions: do not abort on failed svn In case of eglibc, some add-ons that were previously external are now internal (bundled with the main sources). So we do not want to fail if an add-on can't be downloaded; we want to post-pone the check until we can extract the main archive. So: - try to retrieve the add-on - if it fails, print a warning instead of calling CT_Abort - return 1 So, components that want to catch the error and want to handle it can, while components that do not will gracefuly fail thanks to our catching every errors. Bonus: it works without changing any existing retrieval procedure! :-) Signed-off-by: "Yann E. MORIN" diff -r b0eac0056942 -r feee36c11ccc scripts/functions --- a/scripts/functions Mon May 30 23:24:45 2011 +0200 +++ b/scripts/functions Tue May 31 00:57:36 2011 +0200 @@ -636,7 +636,10 @@ CT_MktempDir tmp_dir CT_Pushd "${tmp_dir}" - CT_DoExecLog ALL svn export ${rev:+-r ${rev}} "${uri}" "${basename}" + if ! CT_DoExecLog ALL svn export ${rev:+-r ${rev}} "${uri}" "${basename}"; then + CT_DoLog WARN "Could not retrieve '${basename}'" + return 1 + fi CT_DoExecLog ALL tar cjf "${CT_TARBALLS_DIR}/${basename}.tar.bz2" "${basename}" CT_SaveLocal "${CT_TARBALLS_DIR}/${basename}.tar.bz2"