Commit b45bc8ac authored by Antonio Terceiro's avatar Antonio Terceiro

Fix chdist calls on stable

the version of chdist in stable doesn't actually accept -d as a short
version of --data-dir. Anyway, using long options in scripts is better
for those reading the source.
parent a7f4f899
......@@ -25,7 +25,7 @@ if [ -z "$pkg" ]; then
fi
binaries=$(list_binaries "$pkg")
APT_CHDIST="chdist -d $debci_data_basedir/chdist apt-get $debci_suite-$debci_arch --simulate --quiet install"
APT_CHDIST="chdist --data-dir $debci_data_basedir/chdist apt-get $debci_suite-$debci_arch --simulate --quiet install"
{
if ! $APT_CHDIST $binaries 2>&1; then
......
......@@ -18,7 +18,7 @@ name="${debci_suite}-${debci_arch}"
# create new chdist if it doesn't exist already
if [ ! -e "$root/$name" ]; then
echo "Creating new chdist $root/$name"
chdist -d "$root" create "$name" >/dev/null
chdist --data-dir "$root" create "$name" >/dev/null
# figure out default mirror from debootstrap scripts
DEF_MIRROR="http://ftp.debian.org/debian"
......@@ -70,4 +70,4 @@ deb-src ${DEF_MIRROR} $SUITE $COMPONENTS" > "$TARGET/etc/apt/sources.list"
fi
# update apt indexes
chdist -d "$root" apt-get "$name" update
chdist --data-dir "$root" apt-get "$name" update
debci (0.7) UNRELEASED; urgency=medium
debci (0.6.1) unstable; urgency=medium
*
* Fix chdist calls on stable (See #736504)
-- Antonio Terceiro <terceiro@debian.org> Thu, 15 May 2014 12:51:25 -0300
......
......@@ -9,11 +9,11 @@ case $- in
esac
grep_packages() {
chdist -d "${debci_data_basedir}/chdist" grep-dctrl-packages ${debci_suite}-${debci_arch} "$@"
chdist --data-dir "${debci_data_basedir}/chdist" grep-dctrl-packages ${debci_suite}-${debci_arch} "$@"
}
grep_sources() {
chdist -d "${debci_data_basedir}/chdist" grep-dctrl-sources ${debci_suite}-${debci_arch} "$@"
chdist --data-dir "${debci_data_basedir}/chdist" grep-dctrl-sources ${debci_suite}-${debci_arch} "$@"
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment