config/hooks/GRMLBASE/updatebase: fix duplicate Check-Valid-Until

* If the class RELEASE is enabled (which is now default) and we use the
  waybackmachine the sources.list(5) entry 'Check-Valid-Until' will
  be taken care by config/scripts/GRMLBASE/33-aptsetup

Author: crpb

config/hooks/GRMLBASE/updatebase

@@ -38,7 +38,11 @@ if [ -n "${WAYBACK_DATE:-}" ] ; then
     s#^(URIs:)\s+(.*://deb.debian.org/)(.*)\/?$#$1 http://snapshot.debian.org/archive/$3/$d#' \
     "${target}"/etc/apt/sources.list.d/debian.sources
 
-  sed -i '/^Types:/a Check-Valid-Until: no' "${target}"/etc/apt/sources.list.d/debian.sources
+  # config/scripts/GRMLBASE/33-aptsetup will already apply this when class
+  # RELEASE is enabled (default).
+  if ! ifclass RELEASE; then
+    sed -i '/^Types:/a Check-Valid-Until: no' "${target}"/etc/apt/sources.list.d/debian.sources
+  fi
 fi
 
 ## END OF FILE #################################################################

config/scripts/GRMLBASE/33-aptsetup

@@ -16,14 +16,13 @@ set -u
 target=${target:?}
 
 # use snapshot.debian.org based on build date for release
-if ifclass RELEASE ; then
+if ifclass RELEASE; then
   current_date=$(date --utc -d "@${SOURCE_DATE_EPOCH}" +%Y%m%d)
   perl -pi -e 'BEGIN { $d="'"$current_date"'"; } \
     s#^(URIs:)\s+(.*://deb.debian.org/)(.*)\/?$#$1 http://snapshot.debian.org/archive/$3/$d#' \
     "${target}"/etc/apt/sources.list.d/debian.sources
 
   sed -i '/^Types:/a Check-Valid-Until: no' "${target}"/etc/apt/sources.list.d/debian.sources
 fi
-
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2