-
Notifications
You must be signed in to change notification settings - Fork 4
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
__package_apt to accept .dpkg file as --source #66
Draft
fancsali
wants to merge
1
commit into
skonfig:main
Choose a base branch
from
fancsali:feature/package-apt-dpkg
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,11 +60,21 @@ aptget="DEBIAN_FRONTEND=noninteractive apt-get --quiet --yes -o Dpkg::Options::= | |
case ${state_should} | ||
in | ||
present) | ||
if test -n "${version_should}" -a "${version_should}" != "${version_is}" | ||
if [ -f "$__object/parameter/source" ] | ||
then | ||
source_path="$(cat "$__object/parameter/source")" | ||
tempfile="$($__remote_exec $__target_host "mktemp -t cidst.XXXXX.${source_path##*/}")" | ||
|
||
$__remote_copy "$source_path" "$__target_host:$tempfile" | ||
|
||
echo "${aptget:?} $recommendsparam install $tempfile" | ||
elif test -n "${version_should}" -a "${version_should}" != "${version_is}" | ||
then | ||
# other version should be installed | ||
name="${name}=${version_should}" | ||
aptget="${aptget:?} -o APT::Get::allow-downgrades=true" | ||
|
||
echo "${aptget} ${recommendsparam} install ${target_release} '${name}'" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Moving the install command up here breaks the auto-update mechanism below (line 121ff.) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fair point. I shall have a think about this aspect. |
||
elif test "${state_is}" = 'present' | ||
then | ||
if test "${auto_state}" = 'auto' | ||
|
@@ -132,7 +142,6 @@ then | |
fi | ||
EOF | ||
|
||
echo "${aptget} ${recommendsparam} install ${target_release} '${name}'" | ||
echo 'installed' >>"${__messages_out:?}" | ||
;; | ||
absent) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,3 +2,4 @@ name | |
version | ||
state | ||
target-release | ||
source |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't consider executing
$__remote_*
commands from agencode-*
script good style, as they will also be executed for dry runs.This section should go to a
code-local
or, even better, use__file
if possible.Supporting
--source -
, like__file
would also be nice, IMO.also:
cidst
->cdist
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, that's an interesting and important aspect. Thanks for pointing it out.
However, I am in a bit of a pickle here:
gencode-local
wont' really fly here: that will return a filename (and/or create a file) that's unique locally.__file
would then mean, we need to pass the value from themanifest
to thegencode-remote
script, which then means setting up temporary files and such, right?Supporting
--sourece -
seems to be rather out of scope here: how many people will pipe a.dpkg
as a string literal through here?Typo is a nice catch, thanks.