8000 Don't ignore `++pexpect-timeout` value in config file by samosica · Pull Request #166 · xxh/xxh · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Don't ignore ++pexpect-timeout value in config file #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Oct 7, 2023
Merged

Don't ignore ++pexpect-timeout value in config file #166

merged 1 commit into from
Oct 7, 2023

Conversation

samosica
Copy link
Contributor
@samosica samosica commented Oct 7, 2023

This PR fixes #141.

xxh forgets to update ++pexpect-timeout value after loading config file. This is the same as #90.

Test result

  • ~/config.xxhc
hosts:
    testsrv:
        +s: zsh
        ++pexpect-timeout: '30'
  • Before
❯ xxh testsrv ++xxh-config ~/config.xxhc +vv
Load xxh config from /home/i/config.xxhc
Load xxh config for host testsrv
Final arguments list: ['+s', 'zsh', '++pexpect-timeout', '30', 'testsrv', '++xxh-config', '/home/i/config.xxhc', '+vv']
ssh arguments: ['-o', 'StrictHostKeyChecking=accept-new']
RUN SHELL COMMAND: mkdir -v -p /home/i/.xxh /home/i/.xxh/.xxh/plugins /home/i/.xxh/.xxh/shells
Pexpect command (timeout=6): bash -c 'echo -e "xxh_home_realpath=\$(dirname ~/.xxh)/\$(basename ~/.xxh)\n            xxh_version=\"dir_not_found\"\n            if [[ -d \$xxh_home_realpath ]]; then\n                xxh_version=\$([ \"\$(ls -A \$xxh_home_realpath)\" ] && echo \"version_not_found\" || echo \"dir_empty\")\n                settings_path=\$xxh_home_realpath/.xxh/xxh_version\n                if [[ -f \$settings_path ]]; then\n                    xxh_version=\$(cat \$settings_path)\n                fi\n            fi\n            echo xxh_home_realpath=\$xxh_home_realpath\n
  echo xxh_version=\$xxh_version\n            echo xxh_shell_exists=\`[ -d \$xxh_home_realpath/.xxh/shells/xxh-shell-zsh ] && echo \"1\" ||echo \"0\"\`\n            echo xxh_home_writable=\`[ -w \$xxh_home_realpath ] && echo \"1\" ||echo \"0\"\`\n            echo xxh_parent_home_writable=\$([ -w \$(dirname \$xxh_home_realpath) ] && echo \"1\" ||echo \"0\")\n            echo rsync=\`command -v rsync\`\n            echo scp=\`command -v scp\`\n            echo shell=\`command -v zsh\`\n            echo kernel=\`uname -s\`\n            echo arch=\`uname -m\`" | ssh -v "-o" "StrictHostKeyChecking=accept-new" testsrv -T "bash -s"'

Pexpect command (timeout=6) shows that xxh ignores ++pexpect-timeout value in config file.

  • After
❯ ./xxh testsrv ++xxh-config ~/config.xxhc +vv
Load xxh config from /home/i/config.xxhc
Load xxh config for host testsrv
Final arguments list: ['+s', 'zsh', '++pexpect-timeout', '30', 'testsrv', '++xxh-config', '/home/i/config.xxhc', '+vv']
ssh arguments: ['-o', 'StrictHostKeyChecking=accept-new']
RUN SHELL COMMAND: mkdir -v -p /home/i/.xxh /home/i/.xxh/.xxh/plugins /home/i/.xxh/.xxh/shells
Pexpect command (timeout=30): bash -c 'echo -e "xxh_home_realpath=\$(dirname ~/.xxh)/\$(basename ~/.xxh)\n            xxh_version=\"dir_not_found\"\n            if [[ -d \$xxh_home_realpath ]]; then\n                xxh_version=\$([ \"\$(ls -A \$xxh_home_realpath)\" ] && echo \"version_not_found\" || echo \"dir_empty\")\n                settings_path=\$xxh_home_realpath/.xxh/xxh_version\n                if [[ -f \$settings_path ]]; then\n                    xxh_version=\$(cat \$settings_path)\n                fi\n            fi\n            echo xxh_home_realpath=\$xxh_home_realpath\n
   echo xxh_version=\$xxh_version\n            echo xxh_shell_exists=\`[ -d \$xxh_home_realpath/.xxh/shells/xxh-shell-zsh ] && echo \"1\" ||echo \"0\"\`\n            echo xxh_home_writable=\`[ -w \$xxh_home_realpath ] && echo \"1\" ||echo \"0\"\`\n            echo xxh_parent_home_writable=\$([ -w \$(dirname \$xxh_home_realpath) ] && echo \"1\" ||echo \"0\")\n            echo rsync=\`command -v rsync\`\n            echo scp=\`command -v scp\`\n            echo shell=\`command -v zsh\`\n            echo kernel=\`uname -s\`\n            echo arch=\`uname -m\`" | ssh -v "-o" "StrictHostKeyChecking=accept-new" testsrv -T "bash -s"'

Pexpect command (timeout=30) shows that xxh uses ++pexpect-timeout value in config file.
@anki-code anki-code merged commit 4413828 into xxh:master Oct 7, 2023
@anki-code
Copy link
Member

Thanks @samosica !

@anki-code anki-code added this to the 0.8.13 milestone Oct 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.8.13
Development

Successfully merging this pull request may close these issues.

++pexpect-timeout values in config.xxhc are ignored
2 participants
@samosica @anki-code
0