diff options
author | Andrew Cady <d@jerkface.net> | 2019-06-18 10:52:12 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2019-06-18 10:52:12 -0400 |
commit | 7fb0906b2777a0f392191f7bce194eefbad7cbf0 (patch) | |
tree | 828b46f208bce93d058fdc4e6f6d0b06fb10a2ea /src | |
parent | c90c5fd4b721cf59a94064c4c25915f53fd8b308 (diff) |
selfstrap: better debug output
Diffstat (limited to 'src')
-rwxr-xr-x | src/selfstrap | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/selfstrap b/src/selfstrap index 686566f..31c81cf 100755 --- a/src/selfstrap +++ b/src/selfstrap | |||
@@ -279,7 +279,7 @@ extract_tmp_ci() | |||
279 | dpkg_configure_from_apt_actions() | 279 | dpkg_configure_from_apt_actions() |
280 | { | 280 | { |
281 | while read line; do | 281 | while read line; do |
282 | parse_apt_simul_line "$line" || die "unexpected output from apt-get: $line" | 282 | parse_apt_simul_line "$line" || die "parse_apt_simul_line: unexpected output from apt-get: $line" |
283 | export LC_ALL=C | 283 | export LC_ALL=C |
284 | export DEBIAN_FRONTEND=noninteractive | 284 | export DEBIAN_FRONTEND=noninteractive |
285 | export DPKG_MAINTSCRIPT_PACKAGE="$package" DPKG_MAINTSCRIPT_ARCH="$arch" | 285 | export DPKG_MAINTSCRIPT_PACKAGE="$package" DPKG_MAINTSCRIPT_ARCH="$arch" |
@@ -304,7 +304,7 @@ dpkg_configure_from_apt_actions() | |||
304 | fi | 304 | fi |
305 | ;; | 305 | ;; |
306 | Remv) ;; | 306 | Remv) ;; |
307 | *) die "unexpected output from 'apt-get -s'" ;; | 307 | *) die "dpkg_configure_from_apt_actions: unknown apt simul action: $action" ;; |
308 | esac | 308 | esac |
309 | done | 309 | done |
310 | } | 310 | } |
@@ -329,13 +329,13 @@ dpkg_unpack_from_apt_actions() | |||
329 | { | 329 | { |
330 | while read line; do | 330 | while read line; do |
331 | 331 | ||
332 | parse_apt_simul_line "$line" || die "unexpected output from apt-get: $line" | 332 | parse_apt_simul_line "$line" || die "parse_apt_simul_line: unexpected output from apt-get: $line" |
333 | 333 | ||
334 | deb=/var/cache/apt/archives/${package}_${version//:/%3a}_${arch}.deb | 334 | deb=/var/cache/apt/archives/${package}_${version//:/%3a}_${arch}.deb |
335 | [ -f "$deb" ] || { | 335 | [ -f "$deb" ] || { |
336 | echo "line=$line" >&2 | 336 | echo "line=$line" >&2 |
337 | printf '%s\n' "$action" "$package" "$version" "$arch" >&2 | 337 | printf '%s\n' "$action" "$package" "$version" "$arch" >&2 |
338 | die "unexpected output from apt-get" | 338 | die "deb not found: $deb" |
339 | } | 339 | } |
340 | case "$action" in | 340 | case "$action" in |
341 | Inst) | 341 | Inst) |
@@ -350,7 +350,7 @@ dpkg_unpack_from_apt_actions() | |||
350 | ;; | 350 | ;; |
351 | Conf) ;; | 351 | Conf) ;; |
352 | Remv) ;; | 352 | Remv) ;; |
353 | *) die "unexpected output from 'apt-get -s'" ;; | 353 | *) die "dpkg_unpack_from_apt_actions: unknown apt simul action: $action" ;; |
354 | esac | 354 | esac |
355 | done | 355 | done |
356 | } | 356 | } |