Bug#447326: updated patch
dann frazier <dannf@debian.org> writes:
> This updated patch installs the popcon hook as '10popcon' per Otavio's
> suggestion adn and updates the status bar per Joey's. One additional
> question though: the names of the hook directories seem somewhat
> inconsistent, is pre-pkgsel.d the right name to use here?
I think the directory names is fine. It looks ugly but it is clear ;-)
> --- debian/postinst (revision 49858)
> +++ debian/postinst (working copy)
> @@ -39,12 +39,25 @@
>
> db_progress STEP 1
>
> -# Install popularity-contest but remove it if the user decides not to
> -# participate.
> -if in-target sh -c "$config debconf-apt-progress --from 1 --to 5 --logstderr -- apt-get -o APT::Install-Recommends=false -q -y -f install popularity-contest"; then
> - if ! grep -q '^PARTICIPATE=\"*yes\"*' /target/etc/popularity-contest.conf; then
> - in-target dpkg --purge popularity-contest
> - fi
> +partsdir="/usr/lib/pre-pkgsel.d"
> +if [ -d "$partsdir" ]; then
> + for script in `ls "$partsdir"/*`; do
> + base=$(basename $script | sed 's/[0-9]*//')
> + if ! db_progress INFO pkgsel/progress/$base; then
> + db_subst pkgsel/progress/fallback SCRIPT "$base"
> + db_progress INFO pkgsel/progress/fallback
> + fi
> + if [ -x "$script" ] ; then
> + # be careful to preserve exit code
> + if log-output -t pkgsel "$script"; then
> + :
^^^^^^^ indentation errors
> + else
> + warning "$script returned error code $?"
> + fi
> + else
> + error "Unable to execute $script"
> + fi
> + done
> fi
More indentation errors
> --- popcon (revision 0)
> +++ popcon (revision 0)
I'd say to move it to a pre-pkgsel.d dir inside of source so if we
include any other later it's easy to know that it's the right place to
do it.
Besides that, it looks OK for me.
--
O T A V I O S A L V A D O R
---------------------------------------------
E-mail: otavio@debian.org UIN: 5906116
GNU/Linux User: 239058 GPG ID: 49A5F855
Home Page: http://otavio.ossystems.com.br
---------------------------------------------
"Microsoft sells you Windows ... Linux gives
you the whole house."
Reply to: