change implementation and API of __package_dpkg

__package_dpkg wasn't working as intended - being a singleton meant
that it could only install one package. Now we missuse
/var/cache/apt/archives to copy our package into and `dpkg -i` from
there

cdist/conf/type/__package_dpkg/gencode-remote

@@ -27,31 +27,4 @@
 # do any checks or --force'ing.
 #
 
-local_package_path=$( cat "$__object/parameter/install" )
+echo "dpkg -i /var/cache/apt/archives/$__object_id"
-package=$( basename "$local_package_path" )
-
-if [ ! -f "$local_package_path" ]; then
-   echo "Package \"$local_package_path\" does not exist." >&2
-   exit 1
-fi
-
-# upload package to temp directory
-temp_dir="cdist.XXXXXXXXXX"
-cat << DONE
-destination_dir="\$($__remote_exec $__target_host "mktemp -d $temp_dir")"
-DONE
-
-cat << DONE
-$__remote_copy $local_package_path ${__target_host}:\$destination_dir
-DONE
-
-# install package
-echo "3" >&2
-cat << DONE
-$__remote_exec $__target_host "dpkg -i \"\$destination_dir/$package\""
-DONE
-
-# clean up: remove tmp_dir and contents on remote host
-cat << DONE
-$__remote_exec $__target_host "rm -rf \"\$destination_dir\""
-DONE

cdist/conf/type/__package_dpkg/man.text

@@ -10,27 +10,24 @@ cdist-type__package_dpkg - Manage packages with dpkg
 
 DESCRIPTION
 -----------
-dpkg is usually used on Debian and variants (like Ubuntu) to
+__package_dpkg is used on Debian and variants (like Ubuntu) to
-install packages.
+install packages that are provided locally as *.deb files.
+
+The object given to __package_dpkg must be the name of the deb package.
 
 
 REQUIRED PARAMETERS
 -------------------
-install::
+source::
-    Specifies the local path to the *.deb package to be installed
+    path to the *.deb package
-
-
-OPTIONAL PARAMETERS
--------------------
-None
-
 
 EXAMPLES
 --------
 
 --------------------------------------------------------------------------------
-# Install foo package
+# Install foo and bar packages
-__package_dpkg --install /tmp/foo_0.1_all.deb
+__package_dpkg --source /tmp/foo_0.1_all.deb foo_0.1_all.deb
+__package_dpkg --source $__type/files/bar_1.4.deb bar_1.4.deb
 --------------------------------------------------------------------------------
 
 

cdist/conf/type/__package_dpkg/manifest

@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# 2013 Tomas Pospisek (tpo_deb sourcepole.ch)
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# This __package_dpkg type does not check whether a *.deb package is
+# allready installed. It just copies the *.deb package over to the
+# destination and installs it. We could use __package_apt to check
+# whether a *.deb package is allready installed and only install it
+# if we're given a --force argument or similar (would be clever not
+# to conflict with dpkg's --force options). But currently we don't
+# do any checks or --force'ing.
+
+
+package_path=$( cat "$__object/parameter/source" )
+package=$( basename "$__object_id" )
+
+__file "/var/cache/apt/archives/$package" \
+       --source "$package_path"           \
+       --state  present
+

cdist/conf/type/__package_dpkg/parameter/required

@@ -1 +1 @@
-install
+source