From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 24BCF158017 for ; Tue, 28 Sep 2021 14:20:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5216FE08FE; Tue, 28 Sep 2021 14:20:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F2D6CE08FE for ; Tue, 28 Sep 2021 14:20:15 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-portage-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-portage-dev] [PATCH 4/4] Use ">>>>" and "!!!!" for output prefixes Date: Tue, 28 Sep 2021 16:20:04 +0200 Message-Id: <20210928142004.1375262-5-mgorny@gentoo.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210928142004.1375262-1-mgorny@gentoo.org> References: <20210928142004.1375262-1-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: b82a532d-ca83-4555-b047-783d1aa23e9c X-Archives-Hash: d59ec7c6047f33c9569be576c182ddfc Replace ">>>" with ">>>>" and "!!!" with "!!!!" output prefixes in order to align Portage's messages with the new log output. Signed-off-by: Michał Górny --- bin/clean_locks | 2 +- bin/dohtml.py | 2 +- bin/doins.py | 2 +- bin/ebuild | 8 +- bin/ebuild-helpers/dobin | 2 +- bin/ebuild-helpers/dodoc | 2 +- bin/ebuild-helpers/doexe | 2 +- bin/ebuild-helpers/doinfo | 2 +- bin/ebuild-helpers/dolib | 2 +- bin/ebuild-helpers/doman | 2 +- bin/ebuild-helpers/domo | 2 +- bin/ebuild-helpers/dosbin | 2 +- bin/ebuild-helpers/dosed | 4 +- bin/ebuild-helpers/keepdir | 2 +- bin/ebuild-helpers/newins | 4 +- bin/env-update | 2 +- bin/fixpackages | 4 +- bin/glsa-check | 14 +- bin/install.py | 2 +- bin/misc-functions.sh | 22 +-- bin/phase-functions.sh | 64 ++++----- bin/phase-helpers.sh | 18 +-- bin/portageq | 6 +- cnf/repo.postsync.d/example | 4 +- lib/_emerge/Binpkg.py | 10 +- lib/_emerge/BinpkgExtractorAsync.py | 4 +- lib/_emerge/BinpkgVerifier.py | 12 +- lib/_emerge/BlockerCache.py | 2 +- lib/_emerge/BlockerDB.py | 2 +- lib/_emerge/EbuildBuild.py | 2 +- lib/_emerge/EbuildIpcDaemon.py | 2 +- lib/_emerge/EbuildPhase.py | 2 +- lib/_emerge/JobStatusDisplay.py | 2 +- lib/_emerge/MergeListItem.py | 2 +- lib/_emerge/PackageUninstall.py | 6 +- lib/_emerge/Scheduler.py | 20 +-- lib/_emerge/SpawnProcess.py | 2 +- lib/_emerge/SubProcess.py | 2 +- lib/_emerge/actions.py | 126 ++++++++++-------- lib/_emerge/countdown.py | 4 +- lib/_emerge/depgraph.py | 121 +++++++++-------- lib/_emerge/main.py | 6 +- lib/_emerge/post_emerge.py | 4 +- lib/_emerge/resolver/output_helpers.py | 4 +- lib/_emerge/resolver/slot_collision.py | 16 +-- lib/_emerge/show_invalid_depstring_notice.py | 2 +- lib/_emerge/unmerge.py | 44 +++--- lib/portage/__init__.py | 24 ++-- lib/portage/_selinux.py | 4 +- lib/portage/_sets/shell.py | 2 +- lib/portage/binrepo/config.py | 4 +- lib/portage/data.py | 2 +- lib/portage/dbapi/__init__.py | 2 +- lib/portage/dbapi/bintree.py | 45 ++++--- lib/portage/dbapi/porttree.py | 12 +- lib/portage/dbapi/vartree.py | 94 ++++++------- lib/portage/dep/__init__.py | 48 +++---- lib/portage/elog/__init__.py | 2 +- lib/portage/elog/messages.py | 5 +- lib/portage/elog/mod_custom.py | 4 +- lib/portage/elog/mod_mail_summary.py | 2 +- lib/portage/elog/mod_save_summary.py | 2 +- lib/portage/emaint/modules/binhost/binhost.py | 3 +- lib/portage/env/loaders.py | 14 +- lib/portage/getbinpkg.py | 32 ++--- lib/portage/locks.py | 2 +- lib/portage/mail.py | 12 +- lib/portage/manifest.py | 2 +- lib/portage/metadata.py | 6 +- lib/portage/news.py | 6 +- .../ebuild/_config/LocationsManager.py | 10 +- .../_parallel_manifest/ManifestProcess.py | 6 +- .../_parallel_manifest/ManifestScheduler.py | 2 +- .../ebuild/_parallel_manifest/ManifestTask.py | 6 +- lib/portage/package/ebuild/config.py | 61 ++++----- .../ebuild/deprecated_profile_check.py | 12 +- lib/portage/package/ebuild/digestcheck.py | 24 ++-- lib/portage/package/ebuild/digestgen.py | 20 +-- lib/portage/package/ebuild/doebuild.py | 36 ++--- lib/portage/package/ebuild/fetch.py | 126 +++++++++--------- .../package/ebuild/prepare_build_dirs.py | 25 ++-- lib/portage/repository/config.py | 31 ++--- lib/portage/sync/config_checks.py | 12 +- lib/portage/sync/controller.py | 6 +- lib/portage/sync/modules/cvs/__init__.py | 2 +- lib/portage/sync/modules/cvs/cvs.py | 4 +- lib/portage/sync/modules/git/__init__.py | 4 +- lib/portage/sync/modules/git/git.py | 14 +- .../sync/modules/mercurial/mercurial.py | 4 +- lib/portage/sync/modules/rsync/rsync.py | 60 ++++----- lib/portage/sync/modules/svn/svn.py | 6 +- lib/portage/sync/modules/webrsync/webrsync.py | 10 +- lib/portage/sync/old_tree_timestamp.py | 2 +- lib/portage/sync/syncbase.py | 6 +- lib/portage/tests/resolver/test_autounmask.py | 6 +- .../resolver/test_autounmask_use_breakage.py | 6 +- ...est_slot_conflict_unsatisfied_deep_deps.py | 12 +- lib/portage/update.py | 4 +- lib/portage/util/__init__.py | 30 ++--- .../util/_dyn_libs/PreservedLibsRegistry.py | 4 +- .../util/_dyn_libs/display_preserved_libs.py | 4 +- lib/portage/util/env_update.py | 8 +- lib/portage/util/locale.py | 2 +- lib/portage/util/movefile.py | 40 +++--- lib/portage/util/mtimedb.py | 5 +- lib/portage/util/writeable_check.py | 4 +- lib/portage/versions.py | 20 +-- lib/portage/xml/metadata.py | 18 +-- misc/emerge-delta-webrsync | 8 +- repoman/lib/repoman/__init__.py | 12 +- repoman/lib/repoman/actions.py | 24 ++-- repoman/lib/repoman/gpg.py | 2 +- .../lib/repoman/modules/commit/manifest.py | 4 +- repoman/lib/repoman/modules/vcs/cvs/status.py | 6 +- .../lib/repoman/modules/vcs/git/changes.py | 2 +- repoman/lib/repoman/modules/vcs/svn/status.py | 6 +- repoman/lib/repoman/scanner.py | 4 +- 117 files changed, 834 insertions(+), 788 deletions(-) diff --git a/bin/clean_locks b/bin/clean_locks index e5765fd7e..14f3c857c 100755 --- a/bin/clean_locks +++ b/bin/clean_locks @@ -36,7 +36,7 @@ for x in sys.argv[1:]: except OSError as e: if e.errno in (errno.ENOENT, errno.ENOTDIR): - print("!!! %s is not a directory or does not exist" % x) + print("!!!! %s is not a directory or does not exist" % x) else: raise sys.exit(e.errno) diff --git a/bin/dohtml.py b/bin/dohtml.py index c7235ff4e..344ab7579 100755 --- a/bin/dohtml.py +++ b/bin/dohtml.py @@ -96,7 +96,7 @@ def install(basename, dirname, options, prefix=""): ).rstrip(os.sep) if not os.path.exists(fullpath): - sys.stderr.write("!!! dohtml: %s does not exist\n" % fullpath) + sys.stderr.write("!!!! dohtml: %s does not exist\n" % fullpath) return False elif os.path.isfile(fullpath): ext = os.path.splitext(basename)[1][1:] diff --git a/bin/doins.py b/bin/doins.py index 97b0e2e2f..0f4c0fd3c 100644 --- a/bin/doins.py +++ b/bin/doins.py @@ -34,7 +34,7 @@ def _warn(helper, msg): helper: helper executable name. msg: Message to be output. """ - print("!!! %s: %s\n" % (helper, msg), file=sys.stderr) + print("!!!! %s: %s\n" % (helper, msg), file=sys.stderr) def _parse_group(group): diff --git a/bin/ebuild b/bin/ebuild index 0a2b13a13..2cf004671 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -328,7 +328,7 @@ def stale_env_warning(): (tmpsettings["PF"], ) msg = textwrap.wrap(msg, 70) for x in msg: - portage.writemsg(">>> %s\n" % x) + portage.writemsg(">>>> %s\n" % x) if ebuild_changed: open(os.path.join(tmpsettings['PORTAGE_BUILDDIR'], @@ -359,13 +359,13 @@ for arg in pargs: msg = textwrap.wrap(str(e), 70) del e for x in msg: - portage.writemsg("!!! %s\n" % x, noiselevel=-1) + portage.writemsg("!!!! %s\n" % x, noiselevel=-1) a = 1 except PortagePackageException as e: - portage.writemsg("!!! %s\n" % (e,), noiselevel=-1) + portage.writemsg("!!!! %s\n" % (e,), noiselevel=-1) a = 1 except PermissionDenied as e: - portage.writemsg("!!! Permission Denied: %s\n" % (e,), noiselevel=-1) + portage.writemsg("!!!! Permission Denied: %s\n" % (e,), noiselevel=-1) a = 1 if a == None: print("Could not run the required binary?") diff --git a/bin/ebuild-helpers/dobin b/bin/ebuild-helpers/dobin index 975067fb1..aaa3f2588 100755 --- a/bin/ebuild-helpers/dobin +++ b/bin/ebuild-helpers/dobin @@ -31,7 +31,7 @@ for x in "$@" ; do if [[ -e ${x} ]] ; then install -m0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${ED%/}/${_E_DESTTREE_#/}/bin" else - echo "!!! ${0##*/}: $x does not exist" 1>&2 + echo "!!!! ${0##*/}: $x does not exist" 1>&2 false fi ((ret|=$?)) diff --git a/bin/ebuild-helpers/dodoc b/bin/ebuild-helpers/dodoc index e83091045..30bc3ab0e 100755 --- a/bin/ebuild-helpers/dodoc +++ b/bin/ebuild-helpers/dodoc @@ -29,7 +29,7 @@ for x in "$@" ; do elif [ -s "${x}" ] ; then install -m0644 "${x}" "${dir}" || { ((ret|=1)); continue; } elif [ ! -e "${x}" ] ; then - echo "!!! ${0##*/}: $x does not exist" 1>&2 + echo "!!!! ${0##*/}: $x does not exist" 1>&2 ((ret|=1)) fi done diff --git a/bin/ebuild-helpers/doexe b/bin/ebuild-helpers/doexe index 152c13bf6..27b4acc19 100755 --- a/bin/ebuild-helpers/doexe +++ b/bin/ebuild-helpers/doexe @@ -34,7 +34,7 @@ for x in "$@" ; do if [ -e "$mysrc" ] ; then install ${EXEOPTIONS} "$mysrc" "${ED%/}/${_E_EXEDESTTREE_#/}" else - echo "!!! ${0##*/}: $mysrc does not exist" 1>&2 + echo "!!!! ${0##*/}: $mysrc does not exist" 1>&2 false fi ((ret|=$?)) diff --git a/bin/ebuild-helpers/doinfo b/bin/ebuild-helpers/doinfo index 30a38e055..515cdc3bb 100755 --- a/bin/ebuild-helpers/doinfo +++ b/bin/ebuild-helpers/doinfo @@ -21,7 +21,7 @@ install -m0644 "$@" "${ED%/}/usr/share/info" rval=$? if [ $rval -ne 0 ] ; then for x in "$@" ; do - [ -e "$x" ] || echo "!!! ${0##*/}: $x does not exist" 1>&2 + [ -e "$x" ] || echo "!!!! ${0##*/}: $x does not exist" 1>&2 done __helpers_die "${0##*/} failed" fi diff --git a/bin/ebuild-helpers/dolib b/bin/ebuild-helpers/dolib index bd8eebca7..8975611c6 100755 --- a/bin/ebuild-helpers/dolib +++ b/bin/ebuild-helpers/dolib @@ -50,7 +50,7 @@ for x in "$@" ; do ln -s "$(readlink "${x}")" "${libdir}/${x##*/}" fi else - echo "!!! ${0##*/}: ${x} does not exist" 1>&2 + echo "!!!! ${0##*/}: ${x} does not exist" 1>&2 false fi ((ret|=$?)) diff --git a/bin/ebuild-helpers/doman b/bin/ebuild-helpers/doman index 9cfc89df0..1b56e08dd 100755 --- a/bin/ebuild-helpers/doman +++ b/bin/ebuild-helpers/doman @@ -56,7 +56,7 @@ for x in "$@" ; do install -m0644 "${x}" "${ED%/}/usr/share/man/${mandir}/${name}" ((ret|=$?)) elif [[ ! -e ${x} ]] ; then - echo "!!! ${0##*/}: $x does not exist" 1>&2 + echo "!!!! ${0##*/}: $x does not exist" 1>&2 ((ret|=1)) fi else diff --git a/bin/ebuild-helpers/domo b/bin/ebuild-helpers/domo index 2e95eb751..416e15ae6 100755 --- a/bin/ebuild-helpers/domo +++ b/bin/ebuild-helpers/domo @@ -42,7 +42,7 @@ for x in "$@" ; do fi install -m0644 "${x}" "${mydir}/${MOPREFIX}.mo" else - echo "!!! ${0##*/}: $x does not exist" 1>&2 + echo "!!!! ${0##*/}: $x does not exist" 1>&2 false fi ((ret|=$?)) diff --git a/bin/ebuild-helpers/dosbin b/bin/ebuild-helpers/dosbin index ac0ab37ca..db99ab17a 100755 --- a/bin/ebuild-helpers/dosbin +++ b/bin/ebuild-helpers/dosbin @@ -31,7 +31,7 @@ for x in "$@" ; do if [[ -e ${x} ]] ; then install -m0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${ED%/}/${_E_DESTTREE_#/}/sbin" else - echo "!!! ${0##*/}: ${x} does not exist" 1>&2 + echo "!!!! ${0##*/}: ${x} does not exist" 1>&2 false fi ((ret|=$?)) diff --git a/bin/ebuild-helpers/dosed b/bin/ebuild-helpers/dosed index 37c8a29d3..9c75cbf64 100755 --- a/bin/ebuild-helpers/dosed +++ b/bin/ebuild-helpers/dosed @@ -10,7 +10,7 @@ if ! ___eapi_has_dosed; then fi if [[ $# -lt 1 ]] ; then - echo "!!! ${0##*/}: at least one argument needed" >&2 + echo "!!!! ${0##*/}: at least one argument needed" >&2 exit 1 fi @@ -39,7 +39,7 @@ for x in "$@" ; do done if [ $file_found = 0 ] ; then - echo "!!! ${0##*/}: $y does not exist" 1>&2 + echo "!!!! ${0##*/}: $y does not exist" 1>&2 ((ret|=1)) fi diff --git a/bin/ebuild-helpers/keepdir b/bin/ebuild-helpers/keepdir index a3c0c151c..0ea23ad1b 100755 --- a/bin/ebuild-helpers/keepdir +++ b/bin/ebuild-helpers/keepdir @@ -13,7 +13,7 @@ ret=$? for x in "$@"; do >> "${ED%/}/${x#/}/.keep_${CATEGORY}_${PN}-${SLOT%/*}" || \ - { echo "!!! ${0##*/}: cannot write .keep in ${ED%/}/${x#/}" 1>&2; ret=1; } + { echo "!!!! ${0##*/}: cannot write .keep in ${ED%/}/${x#/}" 1>&2; ret=1; } done [[ ${ret} -ne 0 ]] && __helpers_die "${0##*/} failed" diff --git a/bin/ebuild-helpers/newins b/bin/ebuild-helpers/newins index 30e54b7e5..dcb779913 100755 --- a/bin/ebuild-helpers/newins +++ b/bin/ebuild-helpers/newins @@ -24,14 +24,14 @@ trap 'rm -rf "${TMP}"' EXIT if [[ ${stdin} ]] ; then if [[ -t 0 ]] ; then - __helpers_die "!!! ${helper}: Input is from a terminal" + __helpers_die "!!!! ${helper}: Input is from a terminal" exit 1 fi cat > "${TMP}/$2" ret=$? else if [[ ! -e $1 ]] ; then - __helpers_die "!!! ${helper}: $1 does not exist" + __helpers_die "!!!! ${helper}: $1 does not exist" exit 1 fi diff --git a/bin/env-update b/bin/env-update index 6571b0011..4fe916a6a 100755 --- a/bin/env-update +++ b/bin/env-update @@ -20,7 +20,7 @@ if "--no-ldconfig" in sys.argv: sys.argv.pop(sys.argv.index("--no-ldconfig")) if len(sys.argv) > 1: - print("!!! Invalid command line options!\n") + print("!!!! Invalid command line options!\n") usage(1) from os import path as osp diff --git a/bin/fixpackages b/bin/fixpackages index e56d26ec1..b4d6f6a1d 100755 --- a/bin/fixpackages +++ b/bin/fixpackages @@ -38,9 +38,9 @@ if mysettings['ROOT'] != "/": try: os.nice(int(mysettings.get("PORTAGE_NICENESS", "0"))) except (OSError, ValueError) as e: - portage.writemsg("!!! Failed to change nice value to '%s'\n" % \ + portage.writemsg("!!!! Failed to change nice value to '%s'\n" % \ mysettings["PORTAGE_NICENESS"]) - portage.writemsg("!!! %s\n" % str(e)) + portage.writemsg("!!!! %s\n" % str(e)) del e _global_updates(mytrees, mtimedb["updates"], if_mtime_changed=False) diff --git a/bin/glsa-check b/bin/glsa-check index c8610f7df..db6d95894 100755 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -233,16 +233,16 @@ if mode in ["dump", "fix", "inject", "pretend"]: sys.stdout.write("Fixing GLSA "+myid+"\n") if not myglsa.isVulnerable(): if not quiet: - sys.stdout.write(">>> no vulnerable packages installed\n") + sys.stdout.write(">>>> no vulnerable packages installed\n") else: if quiet: sys.stdout.write("Fixing GLSA "+myid+"\n") mergelist = myglsa.getMergeList(least_change=least_change) if mergelist == []: - sys.stdout.write(">>> cannot fix GLSA, no unaffected packages available\n") + sys.stdout.write(">>>> cannot fix GLSA, no unaffected packages available\n") sys.exit(2) for pkg in mergelist: - sys.stdout.write(">>> merging "+pkg+"\n") + sys.stdout.write(">>>> merging "+pkg+"\n") # using emerge for the actual merging as it contains the dependency # code and we want to be consistent in behaviour. Also this functionality # will be integrated in emerge later, so it shouldn't hurt much. @@ -262,7 +262,7 @@ if mode in ["dump", "fix", "inject", "pretend"]: sys.stdout.write("Checking GLSA "+myid+"\n") if not myglsa.isVulnerable(): if not quiet: - sys.stdout.write(">>> no vulnerable packages installed\n") + sys.stdout.write(">>>> no vulnerable packages installed\n") else: if quiet: sys.stdout.write("Checking GLSA "+myid+"\n") @@ -272,19 +272,19 @@ if mode in ["dump", "fix", "inject", "pretend"]: # first, extract the atoms that cannot be upgraded (where key == "") no_upgrades = [] - sys.stdout.write(">>> The following updates will be performed for this GLSA:\n") + sys.stdout.write(">>>> The following updates will be performed for this GLSA:\n") if "" in mergedict: no_upgrades = mergedict[""] del mergedict[""] # see if anything is left that can be upgraded if mergedict: - sys.stdout.write(">>> Updates that will be performed:\n") + sys.stdout.write(">>>> Updates that will be performed:\n") for (upd, vuln) in mergedict.items(): sys.stdout.write(" " + green(upd) + " (vulnerable: " + red(", ".join(vuln)) + ")\n") if no_upgrades: - sys.stdout.write(">>> No upgrade path exists for these packages:\n") + sys.stdout.write(">>>> No upgrade path exists for these packages:\n") sys.stdout.write(" " + red(", ".join(no_upgrades)) + "\n") sys.stdout.write("\n") elif mode == "inject": diff --git a/bin/install.py b/bin/install.py index d6faeb6a4..e53200c42 100755 --- a/bin/install.py +++ b/bin/install.py @@ -173,7 +173,7 @@ def main(args): returncode = copy_xattrs(opts, files) if returncode != os.EX_OK: portage.util.writemsg( - "!!! install: copy_xattrs failed with the " + "!!!! install: copy_xattrs failed with the " "following arguments: %s\n" % " ".join(portage._shell_quote(x) for x in args), noiselevel=-1, diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index e4defa550..8a4c913b5 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -255,8 +255,8 @@ install_qa_check() { __dyn_instprep() { if [[ -e ${PORTAGE_BUILDDIR}/.instprepped ]] ; then - __vecho ">>> It appears that '$PF' is already instprepped; skipping." - __vecho ">>> Remove '${PORTAGE_BUILDDIR}/.instprepped' to force instprep." + __vecho ">>>> It appears that '$PF' is already instprepped; skipping." + __vecho ">>>> Remove '${PORTAGE_BUILDDIR}/.instprepped' to force instprep." return 0 fi @@ -398,11 +398,11 @@ preinst_sfperms() { find "${ED}" -type f -perm -4000 -print0 | \ while read -r -d $'\0' i ; do if [ -n "$(find "$i" -perm -2000)" ] ; then - ebegin ">>> SetUID and SetGID: [chmod o-r] ${i#${ED%/}}" + ebegin ">>>> SetUID and SetGID: [chmod o-r] ${i#${ED%/}}" chmod o-r "$i" eend $? else - ebegin ">>> SetUID: [chmod go-r] ${i#${ED%/}}" + ebegin ">>>> SetUID: [chmod go-r] ${i#${ED%/}}" chmod go-r "$i" eend $? fi @@ -414,7 +414,7 @@ preinst_sfperms() { # by the SetUID check above. true else - ebegin ">>> SetGID: [chmod o-r] ${i#${ED%/}}" + ebegin ">>>> SetGID: [chmod o-r] ${i#${ED%/}}" chmod o-r "$i" eend $? fi @@ -440,19 +440,19 @@ preinst_suid_scan() { # to files outside of the sandbox, but this # can easly be bypassed using the addwrite() function addwrite "${sfconf}" - __vecho ">>> Performing suid scan in ${ED}" + __vecho ">>>> Performing suid scan in ${ED}" for i in $(find "${ED}" -type f \( -perm -4000 -o -perm -2000 \) ); do if [ -s "${sfconf}" ]; then install_path=${i#${ED%/}} if grep -q "^${install_path}\$" "${sfconf}" ; then __vecho "- ${install_path} is an approved suid file" else - __vecho ">>> Removing sbit on non registered ${install_path}" + __vecho ">>>> Removing sbit on non registered ${install_path}" LC_ALL=C sleep 1.5 ls_ret=$(ls -ldh "${i}") chmod ugo-s "${i}" grep "^#${install_path}$" "${sfconf}" > /dev/null || { - __vecho ">>> Appending commented out entry to ${sfconf} for ${PF}" + __vecho ">>>> Appending commented out entry to ${sfconf} for ${PF}" echo "## ${ls_ret%${ED%/}*}${install_path}" >> "${sfconf}" echo "#${install_path}" >> "${sfconf}" # no delwrite() eh? @@ -476,7 +476,7 @@ preinst_selinux_labels() { # only attempt to label if setfiles is executable # and 'context' is available on selinuxfs. if [ -f /sys/fs/selinux/context -a -x /usr/sbin/setfiles -a -x /usr/sbin/selinuxconfig ]; then - __vecho ">>> Setting SELinux security labels" + __vecho ">>>> Setting SELinux security labels" ( eval "$(/usr/sbin/selinuxconfig)" || \ die "Failed to determine SELinux policy paths."; @@ -488,7 +488,7 @@ preinst_selinux_labels() { else # nonfatal, since merging can happen outside a SE kernel # like during a recovery situation - __vecho "!!! Unable to set SELinux security labels" + __vecho "!!!! Unable to set SELinux security labels" fi fi } @@ -534,7 +534,7 @@ __dyn_package() { fi [ -n "${md5_hash}" ] && \ echo ${md5_hash} > "${PORTAGE_BUILDDIR}"/build-info/BINPKGMD5 - __vecho ">>> Done." + __vecho ">>>> Done." cd "${PORTAGE_BUILDDIR}" >> "$PORTAGE_BUILDDIR/.packaged" || \ diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 9a4c97b16..967af68b5 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -219,8 +219,8 @@ __ebuild_phase_with_hooks() { __dyn_pretend() { if [[ -e $PORTAGE_BUILDDIR/.pretended ]] ; then - __vecho ">>> It appears that '$PF' is already pretended; skipping." - __vecho ">>> Remove '$PORTAGE_BUILDDIR/.pretended' to force pretend." + __vecho ">>>> It appears that '$PF' is already pretended; skipping." + __vecho ">>>> Remove '$PORTAGE_BUILDDIR/.pretended' to force pretend." return 0 fi __ebuild_phase pre_pkg_pretend @@ -232,8 +232,8 @@ __dyn_pretend() { __dyn_setup() { if [[ -e $PORTAGE_BUILDDIR/.setuped ]] ; then - __vecho ">>> It appears that '$PF' is already setup; skipping." - __vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped' to force setup." + __vecho ">>>> It appears that '$PF' is already setup; skipping." + __vecho ">>>> Remove '$PORTAGE_BUILDDIR/.setuped' to force setup." return 0 fi __ebuild_phase pre_pkg_setup @@ -245,7 +245,7 @@ __dyn_setup() { __dyn_unpack() { if [[ -f ${PORTAGE_BUILDDIR}/.unpacked ]] ; then - __vecho ">>> WORKDIR is up-to-date, keeping..." + __vecho ">>>> WORKDIR is up-to-date, keeping..." return 0 fi if [ ! -d "${WORKDIR}" ]; then @@ -253,11 +253,11 @@ __dyn_unpack() { fi cd "${WORKDIR}" || die "Directory change failed: \`cd '${WORKDIR}'\`" __ebuild_phase pre_src_unpack - __vecho ">>> Unpacking source..." + __vecho ">>>> Unpacking source..." __ebuild_phase src_unpack >> "$PORTAGE_BUILDDIR/.unpacked" || \ die "Failed to create $PORTAGE_BUILDDIR/.unpacked" - __vecho ">>> Source unpacked in ${WORKDIR}" + __vecho ">>>> Source unpacked in ${WORKDIR}" __ebuild_phase post_src_unpack } @@ -370,8 +370,8 @@ __has_phase_defined_up_to() { __dyn_prepare() { if [[ -e $PORTAGE_BUILDDIR/.prepared ]] ; then - __vecho ">>> It appears that '$PF' is already prepared; skipping." - __vecho ">>> Remove '$PORTAGE_BUILDDIR/.prepared' to force prepare." + __vecho ">>>> It appears that '$PF' is already prepared; skipping." + __vecho ">>>> Remove '$PORTAGE_BUILDDIR/.prepared' to force prepare." return 0 fi @@ -388,7 +388,7 @@ __dyn_prepare() { trap __abort_prepare SIGINT SIGQUIT __ebuild_phase pre_src_prepare - __vecho ">>> Preparing source in $PWD ..." + __vecho ">>>> Preparing source in $PWD ..." __ebuild_phase src_prepare # keep path in eapply_user in sync! @@ -398,7 +398,7 @@ __dyn_prepare() { >> "$PORTAGE_BUILDDIR/.prepared" || \ die "Failed to create $PORTAGE_BUILDDIR/.prepared" - __vecho ">>> Source prepared." + __vecho ">>>> Source prepared." __ebuild_phase post_src_prepare trap - SIGINT SIGQUIT @@ -407,8 +407,8 @@ __dyn_prepare() { __dyn_configure() { if [[ -e $PORTAGE_BUILDDIR/.configured ]] ; then - __vecho ">>> It appears that '$PF' is already configured; skipping." - __vecho ">>> Remove '$PORTAGE_BUILDDIR/.configured' to force configuration." + __vecho ">>>> It appears that '$PF' is already configured; skipping." + __vecho ">>>> Remove '$PORTAGE_BUILDDIR/.configured' to force configuration." return 0 fi @@ -426,11 +426,11 @@ __dyn_configure() { __ebuild_phase pre_src_configure - __vecho ">>> Configuring source in $PWD ..." + __vecho ">>>> Configuring source in $PWD ..." __ebuild_phase src_configure >> "$PORTAGE_BUILDDIR/.configured" || \ die "Failed to create $PORTAGE_BUILDDIR/.configured" - __vecho ">>> Source configured." + __vecho ">>>> Source configured." __ebuild_phase post_src_configure @@ -440,8 +440,8 @@ __dyn_configure() { __dyn_compile() { if [[ -e $PORTAGE_BUILDDIR/.compiled ]] ; then - __vecho ">>> It appears that '${PF}' is already compiled; skipping." - __vecho ">>> Remove '$PORTAGE_BUILDDIR/.compiled' to force compilation." + __vecho ">>>> It appears that '${PF}' is already compiled; skipping." + __vecho ">>>> Remove '$PORTAGE_BUILDDIR/.compiled' to force compilation." return 0 fi @@ -459,11 +459,11 @@ __dyn_compile() { __ebuild_phase pre_src_compile - __vecho ">>> Compiling source in $PWD ..." + __vecho ">>>> Compiling source in $PWD ..." __ebuild_phase src_compile >> "$PORTAGE_BUILDDIR/.compiled" || \ die "Failed to create $PORTAGE_BUILDDIR/.compiled" - __vecho ">>> Source compiled." + __vecho ">>>> Source compiled." __ebuild_phase post_src_compile @@ -473,8 +473,8 @@ __dyn_compile() { __dyn_test() { if [[ -e $PORTAGE_BUILDDIR/.tested ]] ; then - __vecho ">>> It appears that ${PN} has already been tested; skipping." - __vecho ">>> Remove '${PORTAGE_BUILDDIR}/.tested' to force test." + __vecho ">>>> It appears that ${PN} has already been tested; skipping." + __vecho ">>>> Remove '${PORTAGE_BUILDDIR}/.tested' to force test." return fi @@ -494,20 +494,20 @@ __dyn_test() { ! { has test_network ${PORTAGE_PROPERTIES} && has network ${ALLOW_TEST}; } then einfo "Skipping make test/check due to ebuild restriction." - __vecho ">>> Test phase [disabled because of RESTRICT=test]: ${CATEGORY}/${PF}" + __vecho ">>>> Test phase [disabled because of RESTRICT=test]: ${CATEGORY}/${PF}" # If ${EBUILD_FORCE_TEST} == 1 and FEATURES came from ${T}/environment # then it might not have FEATURES=test like it's supposed to here. elif [[ ${EBUILD_FORCE_TEST} != 1 ]] && ! has test ${FEATURES} ; then - __vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}" + __vecho ">>>> Test phase [not enabled]: ${CATEGORY}/${PF}" else local save_sp=${SANDBOX_PREDICT} addpredict / __ebuild_phase pre_src_test - __vecho ">>> Test phase: ${CATEGORY}/${PF}" + __vecho ">>>> Test phase: ${CATEGORY}/${PF}" __ebuild_phase src_test - __vecho ">>> Completed testing ${CATEGORY}/${PF}" + __vecho ">>>> Completed testing ${CATEGORY}/${PF}" >> "$PORTAGE_BUILDDIR/.tested" || \ die "Failed to create $PORTAGE_BUILDDIR/.tested" @@ -523,8 +523,8 @@ __dyn_install() { if has noauto $FEATURES ; then rm -f "${PORTAGE_BUILDDIR}/.installed" elif [[ -e $PORTAGE_BUILDDIR/.installed ]] ; then - __vecho ">>> It appears that '${PF}' is already installed; skipping." - __vecho ">>> Remove '${PORTAGE_BUILDDIR}/.installed' to force install." + __vecho ">>>> It appears that '${PF}' is already installed; skipping." + __vecho ">>>> Remove '${PORTAGE_BUILDDIR}/.installed' to force install." return 0 fi trap "__abort_install" SIGINT SIGQUIT @@ -578,7 +578,7 @@ __dyn_install() { fi __vecho - __vecho ">>> Install ${CATEGORY}/${PF} into ${D}" + __vecho ">>>> Install ${CATEGORY}/${PF} into ${D}" #our custom version of libtool uses $S and $D to fix #invalid paths in .la files export S D @@ -599,7 +599,7 @@ __dyn_install() { __ebuild_phase src_install >> "$PORTAGE_BUILDDIR/.installed" || \ die "Failed to create $PORTAGE_BUILDDIR/.installed" - __vecho ">>> Completed installing ${CATEGORY}/${PF} into ${D}" + __vecho ">>>> Completed installing ${CATEGORY}/${PF} into ${D}" __vecho __ebuild_phase post_src_install @@ -1031,11 +1031,11 @@ __ebuild_main() { if has noauto $FEATURES && \ [[ ! -f $PORTAGE_BUILDDIR/.unpacked ]] ; then echo - echo "!!! We apparently haven't unpacked..." \ + echo "!!!! We apparently haven't unpacked..." \ "This is probably not what you" - echo "!!! want to be doing... You are using" \ + echo "!!!! want to be doing... You are using" \ "FEATURES=noauto so I'll assume" - echo "!!! that you know what you are doing..." \ + echo "!!!! that you know what you are doing..." \ "You have 5 seconds to abort..." echo diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 94f4f24f2..3ccb58a9b 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -269,8 +269,8 @@ use() { use_with() { if [ -z "$1" ]; then - echo "!!! use_with() called without a parameter." >&2 - echo "!!! use_with [ [value]]" >&2 + echo "!!!! use_with() called without a parameter." >&2 + echo "!!!! use_with [ [value]]" >&2 return 1 fi @@ -291,8 +291,8 @@ use_with() { use_enable() { if [ -z "$1" ]; then - echo "!!! use_enable() called without a parameter." >&2 - echo "!!! use_enable [ [value]]" >&2 + echo "!!!! use_enable() called without a parameter." >&2 + echo "!!!! use_enable [ [value]]" >&2 return 1 fi @@ -321,7 +321,7 @@ unpack() { [ -z "$*" ] && die "Nothing passed to the 'unpack' command" for x in "$@"; do - __vecho ">>> Unpacking ${x} to ${PWD}" + __vecho ">>>> Unpacking ${x} to ${PWD}" suffix=${x##*.} suffix_insensitive=$(LC_ALL=C tr "[:upper:]" "[:lower:]" <<< "${suffix}") y=${x%.*} @@ -703,8 +703,8 @@ econf() { if [ -s config.log ]; then echo - echo "!!! Please attach the following file when seeking support:" - echo "!!! ${PWD}/config.log" + echo "!!!! Please attach the following file when seeking support:" + echo "!!!! ${PWD}/config.log" fi # econf dies unconditionally in EAPIs 0 to 3 ___eapi_helpers_can_die || die "econf failed" @@ -1188,8 +1188,8 @@ if ___eapi_has_in_iuse; then local use=${1} if [[ -z "${use}" ]]; then - echo "!!! in_iuse() called without a parameter." >&2 - echo "!!! in_iuse " >&2 + echo "!!!! in_iuse() called without a parameter." >&2 + echo "!!!! in_iuse " >&2 die "in_iuse() called without a parameter" fi diff --git a/bin/portageq b/bin/portageq index d3cb9f140..9f94d001b 100755 --- a/bin/portageq +++ b/bin/portageq @@ -1304,9 +1304,9 @@ def add_pquery_arguments(parser): def usage(argv): - print(">>> Portage information query tool") - print(">>> %s" % portage.VERSION) - print(">>> Usage: portageq [