diff options
| -rwxr-xr-x | bin/ebuild.sh | 6 | ||||
| -rwxr-xr-x | bin/emerge | 2 | ||||
| -rw-r--r-- | cnf/etc-update.conf | 2 | ||||
| -rw-r--r-- | pym/portage.py | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index a89b530c9..ccd02cdb2 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -57,7 +57,7 @@ set_colors # the sandbox is disabled by default except when overridden in the relevant stages export SANDBOX_ON="0" -# sandbox support functions; defined prior to profile.bashrc srcing, since the profile might need to add a default exception (/usr/lib64/conftest fex, bug #60147) +# sandbox support functions; defined prior to profile.bashrc srcing, since the profile might need to add a default exception (/usr/lib64/conftest fex) addread() { export SANDBOX_READ="$SANDBOX_READ:$1" } @@ -1872,8 +1872,8 @@ export TMPDIR="${T}" # That will test for unset *or* NULL (""). We want just to set for unset... #turn off glob expansion from here on in to prevent *'s and ? in the DEPEND -#syntax from getting expanded :) Fixes bug #1473 -#check eclass rdepends also. bug #58819 +#syntax from getting expanded :) +#check eclass rdepends also. set -f if [ "${RDEPEND-unset}" == "unset" ] && [ "${E_RDEPEND-unset}" == "unset" ] ; then export RDEPEND="${DEPEND} ${E_DEPEND}" diff --git a/bin/emerge b/bin/emerge index 3336ba189..cb130c5eb 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3132,7 +3132,7 @@ elif "depclean"==myaction: print "\n!!! Proceeding will break your installation.\n" countdown(EMERGE_WARNING_DELAY, ">>> Depclean") - if not "--pretend" in myopts": #just check pretend, since --ask implies pretend bug #119049 + if not "--pretend" in myopts": #just check pretend, since --ask implies pretend emergelog(" >>> depclean") mydepgraph=depgraph(myaction,myopts) diff --git a/cnf/etc-update.conf b/cnf/etc-update.conf index 74047b030..647af1270 100644 --- a/cnf/etc-update.conf +++ b/cnf/etc-update.conf @@ -21,7 +21,7 @@ cp_opts="-i" pager="less" #pager="" -# For emacs-users bug #86067 +# For emacs-users # diff_command="eval emacs -nw --eval=\(ediff\ \"%file1\"\ \"%file2\"\)" #using_editor=1 diff --git a/pym/portage.py b/pym/portage.py index c027bd236..9ab0a0891 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -4092,7 +4092,6 @@ class dbapi: if mycpv: mysplit = pkgsplit(mycpv) for x in self.match(mysplit[0],use_cache=0): - # fixed bug #41062 if x==mycpv: continue try: @@ -6374,7 +6373,7 @@ class dblink: zing="---" if self.settings["USERLAND"] == "Darwin" and myrealdest[-2:] == ".a": - # XXX kludge, bug #58848; can be killed when portage stops relying on + # XXX kludge, can be killed when portage stops relying on # md5+mtime, and uses refcounts # alright, we've fooled w/ mtime on the file; this pisses off static archives # basically internal mtime != file's mtime, so the linker (falsely) thinks |