Do not fail source retrieval step with apt >=1.1

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 03-get-sources

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/03-get-sources b/etc/grml/fai/config/scripts/GRMLBASE/03-get-sources
index 4e20182..4deb887 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/03-get-sources
+++ b/etc/grml/fai/config/scripts/GRMLBASE/03-get-sources
@@ -42,11 +42,19 @@ apt-get --download-only source "$package" 2>>/grml-live/sources/errors.log
 EOT
   done
 
-  if grep -q . "${target}/grml-live/sources/errors.log" ; then
+  if grep -q '^E:' "${target}/grml-live/sources/errors.log" ; then
     echo "Errors noticed while retrieving sources:" >&2
     cat "${target}/grml-live/sources/errors.log" >&2
     bailout
     exit 1
+  elif grep -q '^W:' "${target}/grml-live/sources/errors.log" ; then
+    echo "Warnings noticed while retrieving sources (not failing the build though):"
+    cat "${target}/grml-live/sources/errors.log"
+  elif grep -q '.' "${target}/grml-live/sources/errors.log" ; then
+    echo "Unclassified problems noticed while retrieving sources:" >&2
+    cat "${target}/grml-live/sources/errors.log" >&2
+    bailout
+    exit 1
   fi
 
 fi