summaryrefslogtreecommitdiffstats
path: root/builder
diff options
context:
space:
mode:
authorjandob2016-04-08 19:22:09 +0200
committerjandob2016-04-08 19:22:09 +0200
commit0c2e22a106c60c294629ed1b34d017851a93e2fd (patch)
tree13e0adfdd71d48e77bec6f8611986248b251615d /builder
parentmore stuff for packaging (diff)
downloadsystemd-init-0c2e22a106c60c294629ed1b34d017851a93e2fd.tar.gz
systemd-init-0c2e22a106c60c294629ed1b34d017851a93e2fd.tar.xz
systemd-init-0c2e22a106c60c294629ed1b34d017851a93e2fd.zip
update rebash
Diffstat (limited to 'builder')
-rwxr-xr-xbuilder/build-initramfs.sh13
m---------builder/dnbd3-rootfs/scripts/rebash0
2 files changed, 9 insertions, 4 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 46e322c0..adb9bf07 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -203,9 +203,10 @@ parse_command_line() {
debug
>>> parse_command_line -p
+ +doc_test_capture_stderr
+doc_test_contains
- Error with given option "-p":
+doc_test_ellipsis
+ Error with given option "-p":
Traceback (most recent call first):
...
@@ -240,9 +241,10 @@ parse_command_line() {
yes
>>> parse_command_line -t; echo $?
+ +doc_test_capture_stderr
+doc_test_contains
- Error with given option "-t":
+doc_test_ellipsis
+ Error with given option "-t":
Traceback (most recent call first):
...
@@ -262,9 +264,10 @@ parse_command_line() {
vim htop
>>> parse_command_line --no-available-option; echo $?
+ +doc_test_capture_stderr
+doc_test_contains
- Error with given option "--no-available-option":
+doc_test_ellipsis
+ Error with given option "--no-available-option":
Traceback (most recent call first):
...
'
@@ -612,7 +615,9 @@ main() {
exceptions.deactivate
}
# endregion
-core.is_main && main "$@"
+if core.is_main; then
+ main "$@"
+fi
# region vim modline
# vim: set tabstop=4 shiftwidth=4 expandtab:
# vim: foldmethod=marker foldmarker=region,endregion:
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
-Subproject e085483973d6d16616a991561dc02339c2e79c2
+Subproject b02fed03777c7d4930ee9c480103fcc26122cf1