summaryrefslogtreecommitdiffstats
path: root/functions
diff options
context:
space:
mode:
authorHéctor Orón Martínez <zumbi@debian.org>2013-05-14 09:22:54 (GMT)
committerHéctor Orón Martínez <zumbi@debian.org>2013-05-14 09:22:54 (GMT)
commitf7d0b10cfe5bb808b8e497026aaf59cccb7226f8 (patch)
treebea23666ca10de02da94c03aa768cd3114f1bd47 /functions
parent183185f4374546a974770a381097dc18923e18df (diff)
downloaddebootstrap-f7d0b10cfe5bb808b8e497026aaf59cccb7226f8.zip
debootstrap-f7d0b10cfe5bb808b8e497026aaf59cccb7226f8.tar.gz
debootstrap-f7d0b10cfe5bb808b8e497026aaf59cccb7226f8.tar.bz2
Report package version information on package retrieve and validation. Closes: #697675
Signed-off-by: Héctor Orón Martínez <zumbi@debian.org>
Diffstat (limited to 'functions')
-rw-r--r--functions8
1 files changed, 5 insertions, 3 deletions
diff --git a/functions b/functions
index 2dc777d..e5e16a3 100644
--- a/functions
+++ b/functions
@@ -276,8 +276,10 @@ get () {
# args: from dest 'nocache'
# args: from dest [checksum size] [alt {checksum size type}]
local displayname
+ local versionname
if [ "${2%.deb}" != "$2" ]; then
displayname="$(echo "$2" | sed 's,^.*/,,;s,_.*$,,')"
+ versionname="$(echo "$2" | sed 's,^.*/,,' | cut -d_ -f2)"
else
displayname="$(echo "$1" | sed 's,^.*/,,')"
fi
@@ -288,7 +290,7 @@ get () {
elif [ "$3" = nocache ]; then
rm -f "$2"
else
- info VALIDATING "Validating %s" "$displayname"
+ info VALIDATING "Validating %s %s" "$displayname" "$versionname"
if verify_checksum "$2" "$3" "$4"; then
return 0
else
@@ -332,10 +334,10 @@ get () {
fi
while [ "$iters" -lt 10 ]; do
- info RETRIEVING "Retrieving %s" "$displayname"
+ info RETRIEVING "Retrieving %s %s" "$displayname" "$versionname"
if ! just_get "$from" "$dest2"; then continue 2; fi
if [ "$checksum" != "" ]; then
- info VALIDATING "Validating %s" "$displayname"
+ info VALIDATING "Validating %s %s" "$displayname" "$versionname"
if verify_checksum "$dest2" "$checksum" "$siz"; then
checksum=""
fi