ungleich-public/cdist
ungleich-public
/
cdist
7
4
Fork 10
Code Issues 58 Pull Requests 15 Projects Releases Wiki Activity

__package_apt to accept .dpk files directly #340

Open
fancsali wants to merge 1 commits from fancsali/cdist:package-apt-dpkg into master
pull from: fancsali/cdist:package-apt-dpkg
merge into: ungleich-public:master
Conversation 0 Commits 1 Files Changed 3 +25 -3
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cdist/conf/type/__package_apt/gencode-remote
View File

@ -101,10 +101,26 @@ if [ ! -f /var/cache/apt/pkgcache.bin ] || [ "\$( stat --format %Y /var/cache/ap
then echo apt-get $apt_opts update > /dev/null 2>&1 || true
fi
EOF
if [ -n "$version" ]; then
name="${name}=${version}"
if [ -f "$__object/parameter/source" ]; then
source_path="$(cat "$__object/parameter/source")"
tempfile="$($__remote_exec $__target_host "mktemp -t cidst.XXXXX.${source_path##*/}")"
# IPv6 fix
if echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$'
then
my_target_host="[${__target_host}]"
else
my_target_host="${__target_host}"
fi
$__remote_copy "$source_path" "${my_target_host}:$tempfile"
echo "$aptget $recommendsparam install $tempfile"
nico commented 2022-07-29 08:59:22 +00:00
Review
Copy Link

Interesting. And how is the tempfile removed eventually?

Interesting. And how is the tempfile removed eventually?
fancsali commented 2022-08-03 08:46:27 +00:00
Review
Copy Link

Well, I reckon, the OS will remove it eventually; wouldn't it?

Well, I reckon, the OS will remove it eventually; wouldn't it?
nico commented 2022-08-03 09:04:46 +00:00
Review
Copy Link

No, why would it? It's a file we copied and in case we use this type a lot, we will have a lot of leftovers. I don't think this is a clean implementation, TBH.

No, why would it? It's a file we copied and in case we use this type a lot, we will have a lot of leftovers. I don't think this is a clean implementation, TBH.
fancsali commented 2022-09-05 18:36:36 +00:00
Review
Copy Link

Well, according to the FHS, it sortof does: "Programs must not assume that any files or directories in /tmp are preserved between invocations of the program." (https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#tmpTemporaryFiles)

Of course, the ones stored in /var/tmp are removed less frequently, as per "5.15. /var/tmp : Temporary files preserved between system reboots" (https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#vartmpTemporaryFilesPreservedBetwee).

I do recall, there was lots of debate around how cdist should clean up after itself, but I can't remember the outcome of that discussion - if it's been decided that this is the official policy now, I am happy to add that. It's just, looking at the other types, it didn't seem so...

Well, according to the FHS, it sortof does: "Programs must not assume that any files or directories in /tmp are preserved between invocations of the program." (https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#tmpTemporaryFiles) Of course, the ones stored in `/var/tmp` are removed less frequently, as per "5.15. /var/tmp : Temporary files preserved between system reboots" (https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#vartmpTemporaryFilesPreservedBetwee). I do recall, there was lots of debate around how `cdist` should clean up after itself, but I can't remember the outcome of that discussion - if it's been decided that this is the official policy now, I am happy to add that. It's just, looking at the other types, it didn't seem so...
smwltr commented 2024-05-09 18:33:03 +00:00
Review
Copy Link

I would like to see this feature added.

If all it takes for @nico to accept it is to rm the tmp file, @fancsali, shall I add that?

I would like to see this feature added. If all it takes for @nico to accept it is to rm the tmp file, @fancsali, shall I add that?
fnux commented 2024-05-15 10:10:13 +00:00
Review
Copy Link

Go ahead, the pull request is already 2 years old. I'd also like to see a better comment than 'Fix IPv6' on line 108 - there's no bug, we just (re)format IPv6 addresses as needed.

Go ahead, the pull request is already 2 years old. I'd also like to see a better comment than 'Fix IPv6' on line 108 - there's no bug, we just (re)format IPv6 addresses as needed.
fancsali commented 2024-05-15 10:34:04 +00:00
Review
Copy Link

I am somewhat snowed under atm, so feel free to adjust the code, ladies and gents...

I am somewhat snowed under atm, so feel free to adjust the code, ladies and gents...
else
if [ -n "$version" ]; then
name="${name}=${version}"
fi
echo "$aptget $recommendsparam install $target_release '$name'"
fi
echo "$aptget $recommendsparam install $target_release '$name'"
echo "installed" >> "$__messages_out"
;;
absent)

5
cdist/conf/type/__package_apt/man.rst
View File

@ -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
------------------

1
cdist/conf/type/__package_apt/parameter/optional
View File

@ -2,3 +2,4 @@ name
version
state
target-release
source