summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--functions8
2 files changed, 12 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index e1bcf4d..34b79df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debootstrap (1.0.50) UNRELEASED; urgency=low
+
+ * Report package version information on package retrieve and validation.
+ Closes: #697675
+
+ -- Hector Oron <zumbi@debian.org> Tue, 08 Jan 2013 11:23:46 +0100
+
debootstrap (1.0.49) unstable; urgency=medium
* Add support for jessie. Closes: #706788
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