| 1 |
On Sat, 10 Oct 2015 01:11:13 -0400 |
| 2 |
Mike Frysinger <vapier@g.o> wrote: |
| 3 |
|
| 4 |
> Catalyst shouldn't delay & read from stdin and prompt the user. |
| 5 |
> Currently, using verbose mode will trigger that behavior. |
| 6 |
> --- |
| 7 |
> targets/stage2/stage2-chroot.sh | 7 ------- |
| 8 |
> targets/support/chroot-functions.sh | 7 ------- |
| 9 |
> targets/tinderbox/tinderbox-chroot.sh | 7 ------- |
| 10 |
> 3 files changed, 21 deletions(-) |
| 11 |
> |
| 12 |
> diff --git a/targets/stage2/stage2-chroot.sh |
| 13 |
> b/targets/stage2/stage2-chroot.sh index 0e21ea6..b426dab 100755 |
| 14 |
> --- a/targets/stage2/stage2-chroot.sh |
| 15 |
> +++ b/targets/stage2/stage2-chroot.sh |
| 16 |
> @@ -8,13 +8,6 @@ export FEATURES="${clst_myfeatures} nodoc noman |
| 17 |
> noinfo -news" if [ "${clst_VERBOSE}" ] |
| 18 |
> then |
| 19 |
> /usr/portage/scripts/bootstrap.sh -p ${bootstrap_opts} |
| 20 |
> - echo "Press any key within 15 seconds to pause the build..." |
| 21 |
> - read -s -t 15 -n 1 |
| 22 |
> - if [ $? -eq 0 ] |
| 23 |
> - then |
| 24 |
> - echo "Press any key to continue..." |
| 25 |
> - read -s -n 1 |
| 26 |
> - fi |
| 27 |
> fi |
| 28 |
> |
| 29 |
> # Set bindist USE flag if clst_BINDIST is set |
| 30 |
> diff --git a/targets/support/chroot-functions.sh |
| 31 |
> b/targets/support/chroot-functions.sh index 2482651..fe40157 100755 |
| 32 |
> --- a/targets/support/chroot-functions.sh |
| 33 |
> +++ b/targets/support/chroot-functions.sh |
| 34 |
> @@ -288,13 +288,6 @@ run_merge() { |
| 35 |
> then |
| 36 |
> echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt |
| 37 |
> $@" || exit 1 emerge ${clst_myemergeopts} -pt $@ || exit 3 |
| 38 |
> - echo "Press any key within 15 seconds to pause the |
| 39 |
> build..." |
| 40 |
> - read -s -t 15 -n 1 |
| 41 |
> - if [ $? -eq 0 ] |
| 42 |
> - then |
| 43 |
> - echo "Press any key to continue..." |
| 44 |
> - read -s -n 1 |
| 45 |
> - fi |
| 46 |
> fi |
| 47 |
> |
| 48 |
> echo "emerge ${clst_myemergeopts} $@" || exit 1 |
| 49 |
> diff --git a/targets/tinderbox/tinderbox-chroot.sh |
| 50 |
> b/targets/tinderbox/tinderbox-chroot.sh index 4ebc2cc..74e46d6 100755 |
| 51 |
> --- a/targets/tinderbox/tinderbox-chroot.sh |
| 52 |
> +++ b/targets/tinderbox/tinderbox-chroot.sh |
| 53 |
> @@ -15,13 +15,6 @@ do |
| 54 |
> if [ -n "${clst_VERBOSE}" ] |
| 55 |
> then |
| 56 |
> run_merge --usepkg --buildpkg --newuse -vp $x |
| 57 |
> - echo "Press any key within 15 seconds to pause the |
| 58 |
> build..." |
| 59 |
> - read -s -t 15 -n 1 |
| 60 |
> - if [ $? -eq 0 ] |
| 61 |
> - then |
| 62 |
> - echo "Press any key to continue..." |
| 63 |
> - read -s -n 1 |
| 64 |
> - fi |
| 65 |
> fi |
| 66 |
> |
| 67 |
> mkdir -p /tmp/packages/$x |
| 68 |
|
| 69 |
looks good, I've heard no objections, so push it :) |
| 70 |
|
| 71 |
If it is really needed we can re-use the tiny function I put to help |
| 72 |
debug some issues. But I highly doubt it will be. |
| 73 |
|
| 74 |
-- |
| 75 |
Brian Dolbec <dolsen> |
Archives