Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 224457 Details for
Bug 309149
eend output position should be unified in python & bash implementation
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
COLS-- incorporated into eend()
portage-2.2_rc67-console-column-fixes-r2.diff (text/plain), 3.34 KB, created by
Michał Górny
on 2010-03-20 23:39:50 UTC
(
hide
)
Description:
COLS-- incorporated into eend()
Filename:
MIME Type:
Creator:
Michał Górny
Created:
2010-03-20 23:39:50 UTC
Size:
3.34 KB
patch
obsolete
> This patch unifies look of eend used in bash & python code, additionally fixing > few inconsistences in bash code. What I've changed is: > 1. Removed additional (useless?) space in RC_ENDCOL eend which were overwriting > last char of RC_DOT_PATTERN (and adjusted ENDCOL width respectively). > 2. Fixed the COLS declaration in unset_colors() to not include screen height > as it is set and used that way everywhere else. > 3. Moved the 'global' COLS decrease directly into ENDCOL declaration as it was > probably useful only for that and broke both non-RC_ENDCOL eend and > RC_DOT_PATTERN. > 4. Make the COLS-- unconditional as it is useful for curses too (and that > couldn't be determined through ${TERM}), it looks better and it certainly > won't hurt on other consoles. Moved it directly onto eend() counts. > 5. Adjusted the Python __last_e_len of ebegin() to match the bash one. Not sure > why it was like that but that fixes the inconsistence of eend() positions. > > 21.03.2010 by MichaŠGórny <gentoo@mgorny.alt.pl> > >diff -dupr portage.orig//bin/isolated-functions.sh portage/bin/isolated-functions.sh >--- portage.orig//bin/isolated-functions.sh 2010-03-21 00:14:27.000000000 +0100 >+++ portage/bin/isolated-functions.sh 2010-03-21 00:37:46.000000000 +0100 >@@ -326,10 +326,10 @@ _eend() { > fi > > if [[ ${RC_ENDCOL} == "yes" ]] ; then >- echo -e "${ENDCOL} ${msg}" >+ echo -e "${ENDCOL} ${msg}" > else > [[ ${LAST_E_CMD} == ebegin ]] || LAST_E_LEN=0 >- printf "%$(( COLS - LAST_E_LEN - 6 ))s%b\n" '' "${msg}" >+ printf "%$(( COLS - LAST_E_LEN - 7 ))s%b\n" '' "${msg}" > fi > > return ${retval} >@@ -397,7 +397,7 @@ get_KV() { > } > > unset_colors() { >- COLS="25 80" >+ COLS=80 > ENDCOL= > > GOOD= >@@ -412,13 +412,10 @@ set_colors() { > COLS=${COLUMNS:-0} # bash's internal COLUMNS variable > (( COLS == 0 )) && COLS=$(set -- $(stty size 2>/dev/null) ; echo $2) > (( COLS > 0 )) || (( COLS = 80 )) >- COLS=$((${COLS} - 8)) # width of [ ok ] == 7 >- # Adjust COLS so that eend works properly on a standard BSD console. >- [[ $TERM = cons25 || $TERM = dumb ]] && ((COLS--)) > > # Now, ${ENDCOL} will move us to the end of the > # column; irregardless of character width >- ENDCOL=$'\e[A\e['${COLS}'C' >+ ENDCOL=$'\e[A\e['$(( COLS - 8 ))'C' > if [ -n "${PORTAGE_COLORMAP}" ] ; then > eval ${PORTAGE_COLORMAP} > else >diff -dupr portage.orig//pym/portage/output.py portage/pym/portage/output.py >--- portage.orig//pym/portage/output.py 2010-03-21 00:14:28.000000000 +0100 >+++ portage/pym/portage/output.py 2010-03-21 00:36:41.000000000 +0100 >@@ -487,9 +487,6 @@ class EOutput(object): > lines, columns = get_term_size() > if columns <= 0: > columns = 80 >- # Adjust columns so that eend works properly on a standard BSD console. >- if os.environ.get("TERM") in ("cons25", "dumb"): >- columns = columns - 1 > self.term_columns = columns > sys.stdout.flush() > sys.stderr.flush() >@@ -518,7 +515,7 @@ class EOutput(object): > if not self.quiet: > out = sys.stdout > self._write(out, >- "%*s%s\n" % ((self.term_columns - self.__last_e_len - 6), >+ "%*s%s\n" % ((self.term_columns - self.__last_e_len - 7), > "", status_brackets)) > > def ebegin(self, msg): >@@ -532,7 +529,7 @@ class EOutput(object): > msg += " ..." > if not self.quiet: > self.einfon(msg) >- self.__last_e_len = len(msg) + 4 >+ self.__last_e_len = len(msg) + 3 > self.__last_e_cmd = "ebegin" > > def eend(self, errno, *msg):
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 309149
:
223383
|
223399
|
224351
|
224455
| 224457