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.

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

__package_apt to accept .dpkg file as --source #66

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

__package_apt to accept .dpkg file as --source #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions type/__package_apt/gencode-remote
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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##*/}")"
Copy link
Member

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 a gencode-* 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

Copy link
Contributor Author

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:

  • Putting it into gencode-local wont' really fly here: that will return a filename (and/or create a file) that's unique locally.
  • Putting it into __file would then mean, we need to pass the value from the manifest to the gencode-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.


$__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}'"
Copy link
Member

Choose a reason for hiding this comment

The 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.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The 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'
Expand Down Expand Up @@ -132,7 +142,6 @@ then
fi
EOF

echo "${aptget} ${recommendsparam} install ${target_release} '${name}'"
echo 'installed' >>"${__messages_out:?}"
;;
absent)
Expand Down
5 changes: 5 additions & 0 deletions type/__package_apt/man.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ version
The version of the package to install. Default is to install the version
chosen by the local package manager.

source
Source dpkg package to upload an install (instead of fetching
from the repositories). Dependencies will be collected and installed
from the usual sources though.


BOOLEAN PARAMETERS
------------------
Expand Down
1 change: 1 addition & 0 deletions type/__package_apt/parameter/optional
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ name
version
state
target-release
source