Skip to content
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.

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

T6058: Fix popen command wrapper handling #4333

Merged
merged 1 commit into from
Feb 7, 2025
Merged

Conversation

HollyGurza
Copy link
Contributor

@HollyGurza HollyGurza commented Feb 5, 2025

Ensure wrapper is only prepended to command when it is non-empty

Change summary

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

How to test / Smoketest result

conf
set system proxy port '3128'
set system proxy url 'http://127.0.0.1'
set system config-management commit-archive location 'git+https://user:[email protected]/user/commit-archive'
commit

before fix:

# commit
Archiving config...
  git+https://gitlab.com/user/commit-archive Unable to upload "git+https://user:[email protected]/user/commit-archive/config.boot-vyos.20250205_052044": [Errno 2] No such file or directory: " ['git', 'clone', 'https://user:[email protected]/user/commit-archive', '/tmp/git-commit-archive-22hte0rg/repository', '--depth=1']"
run-parts: /etc/commit/post-hooks.d/02vyos-commit-archive exited with return code 1

after fix:

vyos@vyos# commit
Archiving config...
  git+https://gitlab.com/user/commit-archive [edit]
vyos@vyos# 

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

Copy link

github-actions bot commented Feb 5, 2025

👍
No issues in PR Title / Commit Title

Copy link
Member

@dmbaturin dmbaturin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix is good, but I find the PR title misleading. The issue with commit archive is a manifestation of this bug, but the bug is not unique to commit archive — it may already have other effects in someone's code. Please adjust the title to make accurately describe what the fix is, then I'll approve it.

Ensure `wrapper` is only prepended to `command` when it is non-empty
@HollyGurza HollyGurza changed the title T6058: Fix git commit archive T6058: Fix popen command wrapper handling Feb 7, 2025
@HollyGurza HollyGurza requested a review from dmbaturin February 7, 2025 04:04
Copy link

github-actions bot commented Feb 7, 2025

CI integration ❌ failed!

Details

CI logs

  • CLI Smoketests (no interfaces) ❌ failed
  • CLI Smoketests (interfaces only) 👍 passed
  • Config tests 👍 passed
  • RAID1 tests 👍 passed
  • TPM tests 👍 passed

@dmbaturin dmbaturin merged commit 5463cf3 into vyos:current Feb 7, 2025
16 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants