summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-06-09 13:28:19 +0200
committerHolger Levsen <holger@layer-acht.org>2015-06-09 13:28:19 +0200
commit01ae2e9c621ff8eed89ce53ddae6cf9a7d2c8fb3 (patch)
tree5d5a8d494fa6c5f421d769c5f1ac914c6781ce91 /bin
parent2839dd2ace985ad79f3562f0da129df4eba17d04 (diff)
downloadjenkins.debian.net-01ae2e9c621ff8eed89ce53ddae6cf9a7d2c8fb3.tar.xz
reproducible: improve output
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_create_meta_pkg_sets.sh27
1 files changed, 19 insertions, 8 deletions
diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh
index c385e45b..2c3d10a3 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -33,7 +33,8 @@ convert_from_deb822_into_source_packages_only() {
update_target() {
mv $TMPFILE $TARGET
- echo "$(date) - $TARGET updated."
+ echo "$(date -u) - $TARGET updated."
+ echo "============================================================================="
}
update_if_similar() {
@@ -48,15 +49,21 @@ update_if_similar() {
if [ $PERCENT -gt 107 ] || [ $PERCENT -lt 93 ] ; then
mv $TMPFILE $TARGET.new
echo
+ echo "Warning: too much difference for $TARGET, aborting. Please investigate and update manually:"
+ echo
echo diff -u $TARGET $TARGET.new
diff -u $TARGET $TARGET.new || true
echo
- echo "Warning: too much difference for $TARGET, aborting. Please investigate and update manually."
KEEP=$(mktemp)
mv $TARGET.new $KEEP
echo "The new pkg-set has been saved as $KEEP for further investigation."
- echo "wc -l $TARGET: $(wc -l $TARGET)"
- echo "wc -l $KEEP: $(wc -l $KEEP)"
+ echo " wc -l $TARGET $KEEP)"
+ wc -l $TARGET $KEEP | grep -v " total"
+ echo
+ echo "To update the package set run:"
+ echo "cp $KEEP $TARGET"
+ echo
+ echo "============================================================================="
else
update_target
fi
@@ -366,8 +373,8 @@ for SUITE in $SUITES ; do
# no pkg sets in experimental
continue
fi
- echo
- echo "$(date) - Creating meta package sets for $SUITE now."
+ echo "============================================================================="
+ echo "$(date -u) - Creating meta package sets for $SUITE now."
echo
DISTNAME="$SUITE-$ARCH"
@@ -386,10 +393,14 @@ for SUITE in $SUITES ; do
PACKAGES=$(ls $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_binary-${ARCH}_Packages)
SOURCES=$(ls $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_source_Sources)
-
+ echo "============================================================================="
+ echo "$(date -u) - Creating meta package sets for $SUITE now."
+ echo "============================================================================="
# finally
update_pkg_sets
- echo "$(date) - Done updating all meta package sets for $SUITE."
+ echo
+ echo "============================================================================="
+ echo "$(date -u) - Done updating all meta package sets for $SUITE."
done
rm -f $TMPFILE ${TMPFILE2}