This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=3b0915de68e4b3c6cbc425b0df1cab2d91cddfc9 commit 3b0915de68e4b3c6cbc425b0df1cab2d91cddfc9 Author: Guillem Jover <[email protected]> AuthorDate: Fri Dec 6 02:03:37 2024 +0100 Remove dpkg-error.sh boilerplate We do not need the program and color setup boilerplate which is now handled automatically by the script itself. Changelog: internal --- debian/dpkg.postinst | 2 -- src/dpkg-db-backup.sh | 3 --- src/dpkg-db-keeper.sh | 3 --- src/dpkg-maintscript-helper.sh | 3 --- 4 files changed, 11 deletions(-) diff --git a/debian/dpkg.postinst b/debian/dpkg.postinst index 8d9f6067f..6b5e5a17d 100644 --- a/debian/dpkg.postinst +++ b/debian/dpkg.postinst @@ -7,8 +7,6 @@ PROGNAME=dpkg . /usr/share/dpkg/sh/dpkg-error.sh -setup_colors - get_vendor() { local origin="$DPKG_ROOT/etc/dpkg/origins/default" diff --git a/src/dpkg-db-backup.sh b/src/dpkg-db-backup.sh index 619f489ea..a4cbf2ba8 100755 --- a/src/dpkg-db-backup.sh +++ b/src/dpkg-db-backup.sh @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. -PROGNAME=$(basename "$0") ADMINDIR=/var/lib/dpkg BACKUPSDIR=/var/backups ROTATE=7 @@ -27,8 +26,6 @@ TAR="${TAR:-tar}" # shellcheck source=src/sh/dpkg-error.sh . "$PKGDATADIR/sh/dpkg-error.sh" -setup_colors - while [ $# -ne 0 ]; do case "$1" in --rotate=*) diff --git a/src/dpkg-db-keeper.sh b/src/dpkg-db-keeper.sh index 8c99a4c20..7672384ba 100755 --- a/src/dpkg-db-keeper.sh +++ b/src/dpkg-db-keeper.sh @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. -PROGNAME=$(basename "$0") ADMINDIR=/var/lib/dpkg PKGDATADIR_DEFAULT=src @@ -24,8 +23,6 @@ PKGDATADIR="${DPKG_DATADIR:-$PKGDATADIR_DEFAULT}" # shellcheck source=src/sh/dpkg-error.sh . "$PKGDATADIR/sh/dpkg-error.sh" -setup_colors - # This script is used to track any change in the dpkg database for later # inspection, either as a matter of record tracking or to aid in debugging # dpkg behavior. It can be installed as a post-invoke hook such as: diff --git a/src/dpkg-maintscript-helper.sh b/src/dpkg-maintscript-helper.sh index d799aa8fe..c7de6edf9 100755 --- a/src/dpkg-maintscript-helper.sh +++ b/src/dpkg-maintscript-helper.sh @@ -591,7 +591,6 @@ END # Main code set -e -PROGNAME=$(basename "$0") version="unknown" DPKG_ROOT=${DPKG_ROOT:+$(realpath "$DPKG_ROOT")} # Remove default root dir. @@ -606,8 +605,6 @@ PKGDATADIR="${DPKG_DATADIR:-$PKGDATADIR_DEFAULT}" # shellcheck source=src/sh/dpkg-error.sh . "$PKGDATADIR/sh/dpkg-error.sh" -setup_colors - command="$1" [ $# -gt 0 ] || badusage "missing command" shift -- Dpkg.Org's dpkg
