File tree Expand file tree Collapse file tree 1 file changed +23
-1
lines changed Expand file tree Collapse file tree 1 file changed +23
-1
lines changed Original file line number Diff line number Diff line change @@ -66,6 +66,11 @@ assert_unmodified_apt_config() {
66
66
fi
67
67
}
68
68
69
+ # Check whether apt-helper is available
70
+ exists_apt_helper () {
71
+ test -x /usr/lib/apt/apt-helper
72
+ }
73
+
69
74
# Check whether python3 and urllib.request are available
70
75
exists_python3_urllib () {
71
76
python3 -c ' import urllib.request' > /dev/null 2>&1
@@ -432,6 +437,19 @@ do_fetch() {
432
437
return 0
433
438
}
434
439
440
+ do_apt_helper () {
441
+ info " Trying apt-helper..."
442
+ run_cmd " /usr/lib/apt/apt-helper download-file '$1 ' '$2 '" 2> $tmp_stderr
443
+ rc=$?
444
+
445
+ if test $rc -eq 0 && test -s " $2 " ; then
446
+ return 0
447
+ fi
448
+
449
+ capture_tmp_stderr " apthelper"
450
+ return 1
451
+ }
452
+
435
453
do_python3_urllib () {
436
454
info " Trying python3 (urllib.request)..."
437
455
run_cmd " python3 -c 'import urllib.request ; urllib.request.urlretrieve(\" $1 \" , \" $2 \" )'" 2> $tmp_stderr
@@ -525,7 +543,11 @@ do_download() {
525
543
do_python3_urllib $1 $2 && return 0
526
544
fi
527
545
528
- critical " Cannot download package as none of wget/curl/fetch/perl-LWP-Simple/perl-File-Fetch/python3 is found"
546
+ if exists_apt_helper; then
547
+ do_apt_helper $1 $2 && return 0
548
+ fi
549
+
550
+ critical " Cannot download package as none of wget/curl/fetch/perl-LWP-Simple/perl-File-Fetch/python3/apt-helper is found"
529
551
unable_to_retrieve_package
530
552
}
531
553
You can’t perform that action at this time.
0 commit comments