From: Fabian Groffen Date: Sun, 13 Jan 2008 11:07:32 +0000 (-0000) Subject: Merged from trunk 9179:9201 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=44ef980dae0299085a54878469509f66f36409bd;p=portage.git Merged from trunk 9179:9201 | 9184 | Fix a typo. | | zmedico | | | 9186 | Adjust the max DESCRIPTION.toolong length to 100 | | zmedico | characters so that it's not too small and only about 3% of | | | packages will trigger it. | | 9188 | Bug #205318 - Handle errno.ENOTDIR thrown from the lstat | | zmedico | call inside dblink._security_check(). | | 9190 | Bug #203887 - Make repoman recognize | | zmedico | RESTRICT="installsources". | | 9192 | Replace hardcoded value with max_desc_len. | | zmedico | | | 9194 | In preprocess_ebuild_env(), move a | | zmedico | filter_readonly_variables call out of a subshell since | | | FreeBSD and prefix users have reported apparent corruption | | | of the PATH environment variable that triggers calls to | | | the wrong version of sed (one that does not support the -r | | | option). An example of what users have observed: >>> | | | Source compiled. sed: illegal option -- r usage: sed | | | script [-Ealn] [-i extension] [file ...] sed [-Ealn] [-i | | | extension] [-e script] ... [-f script_file] ... [file ...] | | | Traceback (most recent call last): File | | | "/usr/lib/portage/bin/filter-bash-environment.py", line | | | 51, in compile_egrep_pattern(args[0]), file_in, file_out) | | | File "/usr/lib/portage/bin/filter-bash-environment.py", | | | line 34, in filter_bash_environment file_out.write(line) | | | IOError: [Errno 32] Broken pipe | | 9195 | Remove redundant return statement. | | zmedico | | | 9197 | Add some notes about enhancements related to binary | | zmedico | package support that's now in 2.1.4. | | 9200 | style fixes (imports), add support for --version (bug | | WarnerBro | 138159) | | 9201 | fix typo in emerge-webrsync from r9118 | | WarnerBro | | svn path=/main/branches/prefix/; revision=9203 --- diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 8c1f6b3eb..6cd820756 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -28,6 +28,17 @@ portage-2.2 atoms in a set will be unmerged even if they are depended upon by other packages +portage-2.1.4 +================================== + +* Visibility filtering is now supported for binary packages, so masking behavior + is essentially equivalent to that of ebuilds. +* There is no need to have a complete portage tree available when installing binary + packages or uninstalling packages, but a warning message will still be displayed if + it appears that a valid profile is not available. +* The emerge --search action supports searching of both installed and binary packages + The --usepkg and --usepkgonly options control which repositories are searched. + portage-2.1.3 ================================== diff --git a/bin/ebuild.sh b/bin/ebuild.sh index d97745569..e7f944099 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1507,10 +1507,11 @@ preprocess_ebuild_env() { # and functions that could interfere with the current environment. save_ebuild_env || exit $? touch "${T}/environment.success" || exit $? - ) | filter_readonly_variables > "${T}/environment.filtered" + ) > "${T}/environment.filtered" local retval if [ -e "${T}/environment.success" ] ; then - mv "${T}/environment.filtered" "${T}/environment" + filter_readonly_variables < \ + "${T}/environment.filtered" > "${T}/environment" retval=$? else retval=1 diff --git a/bin/emaint b/bin/emaint index 38a13b87e..2f03202ce 100755 --- a/bin/emaint +++ b/bin/emaint @@ -1,8 +1,11 @@ #!@PYTHON@ -O - -import sys, os, time, signal -from optparse import OptionParser, OptionValueError +# vim: noet : +import os import re +import signal +import sys +import time +from optparse import OptionParser, OptionValueError # for an explanation on this logic, see pym/_emerge/__init__.py import os @@ -14,6 +17,7 @@ else: import portage import portage.const, portage.exception, portage.output + class WorldHandler(object): def name(): @@ -450,7 +454,7 @@ def emaint_main(myargv): usage+= "tools and provide a single interface to system health checks." - parser = OptionParser(usage=usage) + parser = OptionParser(usage=usage, version=portage.VERSION) parser.add_option("-c", "--check", help="check for problems", action="callback", callback=exclusive, callback_kwargs={"var":"action"}) parser.add_option("-f", "--fix", help="attempt to fix problems", diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 6c3ad1916..37c727260 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -50,7 +50,7 @@ get_date_part() { local utc_time_in_secs="$1" local part="$2" - if [[ ${USERLAND} == BSD ]] || ; then + if [[ ${USERLAND} == BSD ]] ; then date -r ${utc_time_in_secs} -u +"${part}" else date -d @${utc_time_in_secs} -u +"${part}" diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 5e8ed6fc6..080367570 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -406,7 +406,7 @@ install_qa_check() { *) abort="yes";; esac fi - if [[ ${abort} == "yes" ]] || ; then + if [[ ${abort} == "yes" ]] ; then 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 | \ diff --git a/bin/repoman b/bin/repoman index 22e1051fd..6bc830405 100755 --- a/bin/repoman +++ b/bin/repoman @@ -73,7 +73,7 @@ from portage.output import ConsoleStyleFile, StyleWriter initialize_logger() # 14 is the length of DESCRIPTION="" -max_desc_len = 80 - 14 +max_desc_len = 100 allowed_filename_chars="a-zA-Z0-9._-+:" allowed_filename_chars_set = {} map(allowed_filename_chars_set.setdefault, map(chr, range(ord('a'), ord('z')+1))) @@ -260,7 +260,7 @@ qahelp={ "KEYWORDS.stupid":"Ebuilds that use KEYWORDS=-* instead of package.mask", "LICENSE.missing":"Ebuilds that have a missing or empty LICENSE variable", "DESCRIPTION.missing":"Ebuilds that have a missing or empty DESCRIPTION variable", - "DESCRIPTION.toolong":"DESCRIPTION line is over 80 characters", + "DESCRIPTION.toolong":"DESCRIPTION is over %d characters" % max_desc_len, "EAPI.unsupported":"Ebuilds that have an unsupported EAPI version (you must upgrade portage)", "SLOT.missing":"Ebuilds that have a missing or empty SLOT variable", "HOMEPAGE.missing":"Ebuilds that have a missing or empty HOMEPAGE variable", @@ -351,7 +351,8 @@ for x in missingvars: qacats.append(x) qawarnings.append(x) -valid_restrict = frozenset(["binchecks", "bindist", "fetch", "mirror", +valid_restrict = frozenset(["binchecks", "bindist", + "fetch", "installsources", "mirror", "primaryuri", "strip", "test", "userpriv"]) # file.executable diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index f4d6d625e..61522f786 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1701,7 +1701,7 @@ class dblink(object): try: s = os.lstat(path) except OSError, e: - if e.errno != errno.ENOENT: + if e.errno not in (errno.ENOENT, errno.ENOTDIR): raise del e continue