* [gentoo-commits] portage r13595 - in main/branches/prefix: bin pym/_emerge
@ 2009-05-02 9:31 Fabian Groffen (grobian)
0 siblings, 0 replies; only message in thread
From: Fabian Groffen (grobian) @ 2009-05-02 9:31 UTC (permalink / raw
To: gentoo-commits
Author: grobian
Date: 2009-05-02 09:31:29 +0000 (Sat, 02 May 2009)
New Revision: 13595
Modified:
main/branches/prefix/bin/isolated-functions.sh
main/branches/prefix/bin/misc-functions.sh
main/branches/prefix/pym/_emerge/__init__.py
Log:
Merged from trunk -r13580:13589
| 13582 | Make elog functions use read -r when splitting lines, so |
| zmedico | that backslashes intended for display will not be eaten. |
| 13584 | Bug #267175 - Instead of "poor code kills airplanes", say |
| zmedico | "install aborted due to poor programming practices shown |
| | above" in order to help the user link the die message to the |
| | related "poor programming practices" messages. Thanks to |
| | Jeremy Olexa <darkside@g.o> for the suggestion. |
| 13589 | Fix DepPriority.__int__() to return distinguishable values, |
| zmedico | for use when measuring hardness for the circular dependency |
| | display. This fixes a problem visible in bug #268038, |
| | comment #0, where buildtime dependencies are incorrectly |
| | displayed as runtime dependencies. |
Modified: main/branches/prefix/bin/isolated-functions.sh
===================================================================
--- main/branches/prefix/bin/isolated-functions.sh 2009-05-02 09:30:11 UTC (rev 13594)
+++ main/branches/prefix/bin/isolated-functions.sh 2009-05-02 09:31:29 UTC (rev 13595)
@@ -176,7 +176,7 @@
return 1
;;
esac
- echo -e "$@" | while read ; do
+ echo -e "$@" | while read -r ; do
echo "$messagetype $REPLY" >> \
"${T}/logging/${EBUILD_PHASE:-other}"
done
@@ -186,8 +186,8 @@
eqawarn() {
elog_base QA "$*"
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
- echo -e "$@" | while read ; do
- vecho -e " $WARN*$NORMAL $REPLY" >&2
+ echo -e "$@" | while read -r ; do
+ vecho " $WARN*$NORMAL $REPLY" >&2
done
LAST_E_CMD="eqawarn"
return 0
@@ -196,8 +196,8 @@
elog() {
elog_base LOG "$*"
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
- echo -e "$@" | while read ; do
- echo -e " $GOOD*$NORMAL $REPLY"
+ echo -e "$@" | while read -r ; do
+ echo " $GOOD*$NORMAL $REPLY"
done
LAST_E_CMD="elog"
return 0
@@ -226,8 +226,8 @@
einfo() {
elog_base INFO "$*"
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
- echo -e "$@" | while read ; do
- echo -e " $GOOD*$NORMAL $REPLY"
+ echo -e "$@" | while read -r ; do
+ echo " $GOOD*$NORMAL $REPLY"
done
LAST_E_CMD="einfo"
return 0
@@ -244,8 +244,8 @@
ewarn() {
elog_base WARN "$*"
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
- echo -e "$@" | while read ; do
- echo -e " $WARN*$NORMAL $RC_INDENTATION$REPLY" >&2
+ echo -e "$@" | while read -r ; do
+ echo " $WARN*$NORMAL $RC_INDENTATION$REPLY" >&2
done
LAST_E_CMD="ewarn"
return 0
@@ -254,8 +254,8 @@
eerror() {
elog_base ERROR "$*"
[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
- echo -e "$@" | while read ; do
- echo -e " $BAD*$NORMAL $RC_INDENTATION$REPLY" >&2
+ echo -e "$@" | while read -r ; do
+ echo " $BAD*$NORMAL $RC_INDENTATION$REPLY" >&2
done
LAST_E_CMD="eerror"
return 0
Modified: main/branches/prefix/bin/misc-functions.sh
===================================================================
--- main/branches/prefix/bin/misc-functions.sh 2009-05-02 09:30:11 UTC (rev 13594)
+++ main/branches/prefix/bin/misc-functions.sh 2009-05-02 09:31:29 UTC (rev 13595)
@@ -539,14 +539,16 @@
fi
if [[ ${abort} == "yes" ]] ; then
if [[ ${gentoo_bug} == "yes" ]] ; then
- die "poor code kills airplanes"
+ die "install aborted due to" \
+ "poor programming practices shown above"
else
echo "Please do not file a Gentoo bug and instead" \
"report the above QA issues directly to the upstream" \
"developers of this software." | fmt -w 70 | \
while read line ; do eqawarn "${line}" ; done
eqawarn "Homepage: ${HOMEPAGE}"
- hasq stricter ${FEATURES} && die "poor code kills airplanes"
+ hasq stricter ${FEATURES} && die "install aborted due to" \
+ "poor programming practices shown above"
fi
fi
fi
Modified: main/branches/prefix/pym/_emerge/__init__.py
===================================================================
--- main/branches/prefix/pym/_emerge/__init__.py 2009-05-02 09:30:11 UTC (rev 13594)
+++ main/branches/prefix/pym/_emerge/__init__.py 2009-05-02 09:31:29 UTC (rev 13595)
@@ -951,6 +951,43 @@
__slots__ = ("satisfied", "optional", "rebuild")
def __int__(self):
+ """
+ Note: These priorities are only used for measuring hardness
+ in the circular dependency display via digraph.debug_print(),
+ and nothing more. For actual merge order calculations, the
+ measures defined by the DepPriorityNormalRange and
+ DepPrioritySatisfiedRange classes are used.
+
+ Attributes Hardness
+
+ not satisfied and buildtime 8
+ not satisfied and runtime 7
+ not satisfied and runtime_post 6
+ satisfied and buildtime and rebuild 5
+ satisfied and buildtime 4
+ satisfied and runtime 3
+ satisfied and runtime_post 2
+ optional 1
+ (none of the above) 0
+
+ """
+ if not self.satisfied:
+ if self.buildtime:
+ return 8
+ if self.runtime:
+ return 7
+ if self.runtime_post:
+ return 6
+ if self.buildtime:
+ if self.rebuild:
+ return 5
+ return 4
+ if self.runtime:
+ return 3
+ if self.runtime_post:
+ return 2
+ if self.optional:
+ return 1
return 0
def __str__(self):
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-05-02 9:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-02 9:31 [gentoo-commits] portage r13595 - in main/branches/prefix: bin pym/_emerge Fabian Groffen (grobian)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox