[gentoo-commits] proj/portage:master commit in: pym/portage/, pym/_emerge/resolver/, cnf/sets/, pym/portage/_sets/, man/, ...
commit: a91492450d86abb34bbd05ccaf0e60d8b1c973a0 Author: Adam Mills armills info> AuthorDate: Wed May 25 16:12:56 2016 + Commit: Alexander Berntsen gentoo org> CommitDate: Fri May 27 08:22:48 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a9149245 Revert "Colorize packages in user sets (bug 577720)" This reverts commit 739845a6eab95fbc44eab1b7b938c860563631d7. The feature implemented in this commit for bug 577720 was determined to be an overcomplicated method of colorizing user sets. Instead, this feature will be implemented as in bug 583164. The configuration options implemented in this reverted commit will be removed. Per bug 583164, packages that belong to a set listed in world_sets will be colorized as world packages. This eliminates the extra configuration and associated complications. See bug 583164 for more details. Acked-by: Alexander Berntsen gentoo.org> Acked-by: Zac Medico gentoo.org Signed-off-by: Alexander Berntsen gentoo.org> cnf/sets/portage.conf | 1 - doc/config/sets.docbook| 4 +--- man/color.map.5| 11 -- man/portage.5 | 1 - pym/_emerge/resolver/output.py | 25 +++--- pym/_emerge/resolver/output_helpers.py | 17 +++ pym/portage/_sets/__init__.py | 8 --- pym/portage/_sets/base.py | 1 - pym/portage/output.py | 39 -- 9 files changed, 30 insertions(+), 77 deletions(-) diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf index e990620..ac282d9 100644 --- a/cnf/sets/portage.conf +++ b/cnf/sets/portage.conf @@ -49,7 +49,6 @@ class = portage.sets.files.StaticFileSet multiset = true directory = %(PORTAGE_CONFIGROOT)setc/portage/sets world-candidate = True -user-set = True # Set to rebuild all packages that need a preserved lib that only remains due # to FEATURES=preserve-libs diff --git a/doc/config/sets.docbook b/doc/config/sets.docbook index 02135d6..749b775 100644 --- a/doc/config/sets.docbook +++ b/doc/config/sets.docbook @@ -57,8 +57,6 @@ is missing) world-candidate, which determines if given package should be added to the world set - user-set, which determines if - given package should be colorized as a user set Some handler classes might require additional options for their configuration, @@ -95,7 +93,7 @@ but to indicate that the section should generate multiple sets it's also necessary to set the multiset option to true. The world-candidate - and user-set options are also supported like with + option also supported like with single sets (they'll apply to all sets generated by the section). diff --git a/man/color.map.5 b/man/color.map.5 index 39f23f7..5543628 100644 --- a/man/color.map.5 +++ b/man/color.map.5 @@ -46,9 +46,6 @@ Defines color used for satisfied blockers. \fBPKG_MERGE\fR = \fI"darkgreen"\fR Defines color used for packages planned to be merged. .TP -\fBPKG_MERGE_USER_SET\fR = \fI"darkgreen"\fR -Defines color used for packages planned to be merged from a user defined set. -.TP \fBPKG_MERGE_SYSTEM\fR = \fI"darkgreen"\fR Defines color used for system packages planned to be merged. .TP @@ -58,10 +55,6 @@ Defines color used for world packages planned to be merged. \fBPKG_BINARY_MERGE\fR = \fI"purple"\fR Defines color used for packages planned to be merged using a binary package. .TP -\fBPKG_BINARY_MERGE_USER_SET\fR = \fI"purple"\fR -Defines color used for packages planned to be merged using a binary package -from a user defined set. -.TP \fBPKG_BINARY_MERGE_SYSTEM\fR = \fI"purple"\fR Defines color used for system packages planned to be merged using a binary package. @@ -73,10 +66,6 @@ package. \fBPKG_NOMERGE\fR = \fI"darkblue"\fR Defines color used for packages not planned to be merged. .TP -\fBPKG_NOMERGE_USER_SET\fR = \fI"darkblue"\fR -Defines color used for packages not planned to be merged from a user defined -set. -.TP \fBPKG_NOMERGE_SYSTEM\fR = \fI"darkblue"\fR Defines color used for system packages not planned to be merged. .TP diff --git a/man/portage.5 b/man/portage.5 index 3cc1f07..7c2a8f7 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -1114,7 +1114,6 @@ class = portage.sets.files.StaticFileSet multiset = true directory = %(PORTAGE_CONFIGROOT)setc/portage/sets world-candidate = True -user-set = True [module-rebuild] class = portage.sets.dbapi.OwnerSet diff --git a
[gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/
commit: 40cdc1c3f467ac94d3a966777eb6a0907c269550
Author: Adam Mills armills info>
AuthorDate: Wed May 25 16:12:57 2016 +
Commit: Alexander Berntsen gentoo org>
CommitDate: Fri May 27 08:23:14 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=40cdc1c3
Colorize packages in world_sets (bug 583164)
Packages belonging to a set listed in world_sets will now be colorized
as a world package.
X-Gentoo-bug: 583164
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=583164
Acked-by: Alexander Berntsen gentoo.org>
Acked-by: Zac Medico gentoo.org>
Signed-off-by: Alexander Berntsen gentoo.org>
pym/_emerge/resolver/output.py | 2 +-
pym/_emerge/resolver/output_helpers.py | 11 +++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index 400617d..ac979f6 100644
--- a/pym/_emerge/resolver/output.py
+++ b/pym/_emerge/resolver/output.py
@@ -707,7 +707,7 @@ class Display(object):
"""
root_config = self.conf.roots[pkg.root]
system_set = root_config.sets["system"]
- world_set = root_config.sets["selected"]
+ world_set = self.conf.selected_sets[pkg.root]
system = False
world = False
try:
diff --git a/pym/_emerge/resolver/output_helpers.py
b/pym/_emerge/resolver/output_helpers.py
index 70f7bc0..b83717e 100644
--- a/pym/_emerge/resolver/output_helpers.py
+++ b/pym/_emerge/resolver/output_helpers.py
@@ -17,6 +17,7 @@ import sys
from portage import os
from portage import _encodings, _unicode_encode
from portage._sets.base import InternalPackageSet
+from portage.exception import PackageSetNotFound
from portage.localization import localized_size
from portage.output import (blue, bold, colorize, create_color_func,
green, red, teal, turquoise, yellow)
@@ -213,6 +214,16 @@ class _DisplayConfig(object):
self.running_root = frozen_config._running_root
self.roots = frozen_config.roots
+ # Create a set of selected packages for each root
+ self.selected_sets = {}
+ for root_name, root in self.roots.items():
+ try:
+ self.selected_sets[root_name] =
InternalPackageSet(
+
initial_atoms=root.setconfig.getSetAtoms("selected"))
+ except PackageSetNotFound:
+ # A nested set could not be resolved, so ignore
nested sets.
+ self.selected_sets[root_name] =
root.sets["selected"]
+
self.blocker_parents = dynamic_config._blocker_parents
self.reinstall_nodes = dynamic_config._reinstall_nodes
self.digraph = dynamic_config.digraph
[gentoo-commits] proj/portage:master commit in: pym/portage/
commit: 68ad3c50221023f6919d66a1d07d4976da037552
Author: Alexander Berntsen gentoo org>
AuthorDate: Wed May 18 08:24:13 2016 +
Commit: Alexander Berntsen gentoo org>
CommitDate: Fri May 20 09:00:20 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=68ad3c50
news.py: Check only for major version when parsing
Only check the major version of news items, as GLEP 42 specifies an
upgrade path for them. Future revisions to news item formats may yield
minor number increments. GLEP 42 further ensures that only
forwards-compatible changes may incur, as incompatible changes demand a
major version increment.
X-Gentoo-Bug: 583560
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=583560
Suggested-by: Ulrich Müller gentoo.org>
Signed-off-by: Alexander Berntsen gentoo.org>
Acked-by: Zac Medico gentoo.org>
pym/portage/news.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pym/portage/news.py b/pym/portage/news.py
index 784ba70..ea1b947 100644
--- a/pym/portage/news.py
+++ b/pym/portage/news.py
@@ -9,6 +9,7 @@ __all__ = ["NewsManager", "NewsItem", "DisplayRestriction",
"DisplayInstalledRestriction",
"count_unread_news", "display_news_notifications"]
+import fnmatch
import io
import logging
import os as _os
@@ -270,7 +271,8 @@ class NewsItem(object):
# Optimization to ignore regex matchines on lines that
# will never match
format_match = _formatRE.match(line)
- if format_match is not None and format_match.group(1)
!= '1.0':
+ if (format_match is not None and
+ not
fnmatch.fnmatch(format_match.group(1), '1.*')):
invalids.append((i + 1, line.rstrip('\n')))
break
if not line.startswith('D'):
[gentoo-commits] proj/portage:master commit in: pym/portage/_sets/, pym/portage/, cnf/sets/, doc/config/, pym/_emerge/resolver/, ...
commit: 739845a6eab95fbc44eab1b7b938c860563631d7 Author: Adam Mills armills info> AuthorDate: Wed Apr 20 12:55:25 2016 + Commit: Alexander Berntsen gentoo org> CommitDate: Mon Apr 25 06:34:23 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=739845a6 Colorize packages in user sets (bug 577720) Three new settings were added to /etc/portage/color.map: PKG_MERGE_USER_SET, PKG_BINARY_MERGE_USER_SET, and PKG_NOMERGE_USER_SET. These colors are applied when the package is selected from a set in /etc/portage/sets/ X-Gentoo-bug: 577720 X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=577720 Signed-off-by: Alexander Berntsen gentoo.org> Acked-by: Zac Medico gentoo.org> Reviewed-by: Alexander Berntsen gentoo.org> cnf/sets/portage.conf | 1 + doc/config/sets.docbook| 4 +++- man/color.map.5| 11 ++ man/portage.5 | 1 + pym/_emerge/resolver/output.py | 25 +++--- pym/_emerge/resolver/output_helpers.py | 17 --- pym/portage/_sets/__init__.py | 8 +++ pym/portage/_sets/base.py | 1 + pym/portage/output.py | 39 ++ 9 files changed, 77 insertions(+), 30 deletions(-) diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf index ac282d9..e990620 100644 --- a/cnf/sets/portage.conf +++ b/cnf/sets/portage.conf @@ -49,6 +49,7 @@ class = portage.sets.files.StaticFileSet multiset = true directory = %(PORTAGE_CONFIGROOT)setc/portage/sets world-candidate = True +user-set = True # Set to rebuild all packages that need a preserved lib that only remains due # to FEATURES=preserve-libs diff --git a/doc/config/sets.docbook b/doc/config/sets.docbook index 749b775..02135d6 100644 --- a/doc/config/sets.docbook +++ b/doc/config/sets.docbook @@ -57,6 +57,8 @@ is missing) world-candidate, which determines if given package should be added to the world set + user-set, which determines if + given package should be colorized as a user set Some handler classes might require additional options for their configuration, @@ -93,7 +95,7 @@ but to indicate that the section should generate multiple sets it's also necessary to set the multiset option to true. The world-candidate - option also supported like with + and user-set options are also supported like with single sets (they'll apply to all sets generated by the section). diff --git a/man/color.map.5 b/man/color.map.5 index 5543628..39f23f7 100644 --- a/man/color.map.5 +++ b/man/color.map.5 @@ -46,6 +46,9 @@ Defines color used for satisfied blockers. \fBPKG_MERGE\fR = \fI"darkgreen"\fR Defines color used for packages planned to be merged. .TP +\fBPKG_MERGE_USER_SET\fR = \fI"darkgreen"\fR +Defines color used for packages planned to be merged from a user defined set. +.TP \fBPKG_MERGE_SYSTEM\fR = \fI"darkgreen"\fR Defines color used for system packages planned to be merged. .TP @@ -55,6 +58,10 @@ Defines color used for world packages planned to be merged. \fBPKG_BINARY_MERGE\fR = \fI"purple"\fR Defines color used for packages planned to be merged using a binary package. .TP +\fBPKG_BINARY_MERGE_USER_SET\fR = \fI"purple"\fR +Defines color used for packages planned to be merged using a binary package +from a user defined set. +.TP \fBPKG_BINARY_MERGE_SYSTEM\fR = \fI"purple"\fR Defines color used for system packages planned to be merged using a binary package. @@ -66,6 +73,10 @@ package. \fBPKG_NOMERGE\fR = \fI"darkblue"\fR Defines color used for packages not planned to be merged. .TP +\fBPKG_NOMERGE_USER_SET\fR = \fI"darkblue"\fR +Defines color used for packages not planned to be merged from a user defined +set. +.TP \fBPKG_NOMERGE_SYSTEM\fR = \fI"darkblue"\fR Defines color used for system packages not planned to be merged. .TP diff --git a/man/portage.5 b/man/portage.5 index 7c2a8f7..3cc1f07 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -1114,6 +1114,7 @@ class = portage.sets.files.StaticFileSet multiset = true directory = %(PORTAGE_CONFIGROOT)setc/portage/sets world-candidate = True +user-set = True [module-rebuild] class = portage.sets.dbapi.OwnerSet diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 400617d..7c70a3e 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -271,6 +271,8 @@ class Dis
[gentoo-commits] proj/portage:master commit in: bin/
commit: 94e9bbb342ec6f2eec746f7500e9b0ae86722df7
Author: Göktürk Yüksek binghamton edu>
AuthorDate: Tue Apr 19 07:53:50 2016 +
Commit: Alexander Berntsen gentoo org>
CommitDate: Fri Apr 22 08:18:25 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=94e9bbb3
portageq: Case-insensitive match maintainer emails
Reported-by: NP-Hardass gentoo.org>
Signed-off-by: Göktürk Yüksek binghamton.edu>
Signed-off-by: Alexander Berntsen gentoo.org>
Reviewed-by: Alexander Berntsen gentoo.org>
bin/portageq | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/portageq b/bin/portageq
index 07d3c49..832d004 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -1,5 +1,5 @@
#!/usr/bin/python -bO
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function, unicode_literals
@@ -1009,7 +1009,7 @@ list_preserved_libs.__doc__ =
docstrings['list_preserved_libs']
class MaintainerEmailMatcher(object):
def __init__(self, maintainer_emails):
- self._re = re.compile("^(%s)$" % "|".join(maintainer_emails))
+ self._re = re.compile("^(%s)$" % "|".join(maintainer_emails),
re.I)
def __call__(self, metadata_xml):
match = False
[gentoo-commits] proj/portage:master commit in: /
commit: aa7558a93d42d73ad916eecd2c3e8c6c294fe735
Author: Sergei Trofimovich google com>
AuthorDate: Sat Mar 19 21:29:32 2016 +
Commit: Alexander Berntsen gentoo org>
CommitDate: Tue Mar 29 10:10:36 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=aa7558a9
runtests: fix output for skipped pythons
I have Pythons 2.7 and 3.4 installed.
Before the patch I had the following output:
$ ./runtests pym/portage/tests/resolver/test_blocker.py
Testing with Python 2.7...
Testing with Python 3.4...
Summary:
| Version| Status
|
| 2.7| PASS
| 3.3| PASS
After the patch:
$ ./runtests pym/portage/tests/resolver/test_blocker.py
Testing with Python 2.7...
Skip Python 3.3...
Testing with Python 3.4...
Skip Python pypy...
Skip Python 3.5...
Summary:
| Version| Status
|
| 2.7| PASS
| 3.4| PASS
Signed-off-by: Sergei Trofimovich google.com>
Signed-off-by: Alexander Berntsen gentoo.org>
Reviewed-by: Alexander Berntsen gentoo.org>
runtests | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/runtests b/runtests
index d492bc8..9135768 100755
--- a/runtests
+++ b/runtests
@@ -42,7 +42,7 @@ class Colors(object):
_COLORS_YES = ('y', 'yes', 'true')
_COLORS_NO = ('n', 'no', 'false')
- GOOD = BAD = NORMAL = ''
+ WARN = GOOD = BAD = NORMAL = ''
def __init__(self, colorize=None):
if colorize is None:
@@ -63,6 +63,7 @@ class Colors(object):
raise ValueError('--colors is invalid: %s' %
colorize)
if colorize:
+ self.WARN = '\033[1;33m'
self.GOOD = '\033[1;32m'
self.BAD = '\033[1;31m'
self.NORMAL = '\033[0m'
@@ -135,11 +136,14 @@ def main(argv):
if os.access(prog, os.X_OK):
print('%sTesting with Python %s...%s' %
(colors.GOOD, ver, colors.NORMAL))
- statuses.append(subprocess.call(cmd))
+ statuses.append((ver, subprocess.call(cmd)))
elif not ignore_missing:
print('%sCould not find requested Python %s%s' %
(colors.BAD, ver, colors.NORMAL))
- statuses.append(1)
+ statuses.append((ver, 1))
+ else:
+ print('%sSkip Python %s...%s' %
+ (colors.WARN, ver, colors.NORMAL))
print()
finally:
if tempdir is not None:
@@ -154,7 +158,9 @@ def main(argv):
width = 10
header = '| %-*s | %s' % (width, 'Version', 'Status')
print('%s\n|%s' % (header, '-' * (len(header) - 1)))
- for ver, status in zip(pyversions, statuses):
+ exit_status = 0
+ for ver, status in statuses:
+ exit_status += status
if status:
color = colors.BAD
msg = 'FAIL'
@@ -163,7 +169,7 @@ def main(argv):
msg = 'PASS'
print('| %s%-*s%s | %s%s%s' %
(color, width, ver, colors.NORMAL, color, msg,
colors.NORMAL))
- exit(sum(statuses))
+ exit(exit_status)
if __name__ == '__main__':
[gentoo-commits] proj/portage:master commit in: pym/_emerge/
commit: 12c91bce20eeb7d6746b148b1056084a18bd8c53
Author: Sergei Trofimovich google com>
AuthorDate: Sat Mar 19 21:29:22 2016 +
Commit: Alexander Berntsen gentoo org>
CommitDate: Tue Mar 29 08:31:08 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=12c91bce
cleanup: fix spaces to tabs in depgraph.py
Signed-off-by: Sergei Trofimovich google.com>
pym/_emerge/depgraph.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index b58fbda..cfaafa3 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5126,9 +5126,9 @@ class depgraph(object):
break
writemsg("\nemerge: there are no %s to satisfy " %
-("binary packages" if
- self._frozen_config.myopts.get("--usepkgonly", "y") == True
- else "ebuilds") + green(xinfo) + ".\n", noiselevel=-1)
+ ("binary packages" if
+ self._frozen_config.myopts.get("--usepkgonly",
"y") == True
+ else "ebuilds") + green(xinfo) + ".\n",
noiselevel=-1)
if isinstance(myparent, AtomArg) and \
not cp_exists and \
self._frozen_config.myopts.get(
@@ -6937,7 +6937,7 @@ class depgraph(object):
for root in implicit_libc_roots:
vardb = self._frozen_config.trees[root]["vartree"].dbapi
for atom in self._expand_virt_from_graph(root,
- portage.const.LIBC_PACKAGE_ATOM):
+ portage.const.LIBC_PACKAGE_ATOM):
if atom.blocker:
continue
for pkg in
self._dynamic_config._package_tracker.match(root, atom):
[gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/
commit: fbbe76199b897828f26aed828eb7ad476bc33264 Author: Alexander Berntsen gentoo org> AuthorDate: Tue Feb 2 20:48:58 2016 + Commit: Alexander Berntsen gentoo org> CommitDate: Tue Feb 2 20:48:58 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=fbbe7619 Update copyright headers Update copyright headers to reflect the changes made in the following commits: * 8c9b1d6a7c115344cdc5bd8e7d122ab721aeb53a Clarify no binary packages error (bug 573070) * 3ff375e832d469f03dc922f7a30651726f86d3e0 Make config update tools stand out (bug 543706) * 4369d1aca89eaecd589af4aa7a387ce36e5c42e7 Be extra clear on INSTALL_MASK & dirs (bug 527004) Signed-off-by: Alexander Berntsen gentoo.org> man/emerge.1 | 2 +- man/make.conf.5 | 2 +- pym/_emerge/chk_updated_cfg_files.py | 2 +- pym/_emerge/depgraph.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index 0f5782e..bfa2f73 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -1,4 +1,4 @@ -.TH "EMERGE" "1" "Jan 2015" "Portage VERSION" "Portage" +.TH "EMERGE" "1" "Feb 2016" "Portage VERSION" "Portage" .SH "NAME" emerge \- Command\-line interface to the Portage system .SH "SYNOPSIS" diff --git a/man/make.conf.5 b/man/make.conf.5 index 49c88ce..26bbf06 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -1,4 +1,4 @@ -.TH "MAKE.CONF" "5" "Jan 2015" "Portage VERSION" "Portage" +.TH "MAKE.CONF" "5" "Feb 2016" "Portage VERSION" "Portage" .SH "NAME" make.conf \- custom settings for Portage .SH "SYNOPSIS" diff --git a/pym/_emerge/chk_updated_cfg_files.py b/pym/_emerge/chk_updated_cfg_files.py index 6903df9..e5e0907 100644 --- a/pym/_emerge/chk_updated_cfg_files.py +++ b/pym/_emerge/chk_updated_cfg_files.py @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2012, 2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 05d1da5..b58fbda 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import division, print_function, unicode_literals
[gentoo-commits] proj/portage:master commit in: man/
commit: 4369d1aca89eaecd589af4aa7a387ce36e5c42e7 Author: Alexander Berntsen gentoo org> AuthorDate: Tue Feb 2 14:10:13 2016 + Commit: Alexander Berntsen gentoo org> CommitDate: Tue Feb 2 14:10:54 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4369d1ac Be extra clear on INSTALL_MASK & dirs (bug 527004) Signed-off-by: Alexander Berntsen gentoo.org> X-Gentoo-Bug: 527004 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=527004 man/make.conf.5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/make.conf.5 b/man/make.conf.5 index 1d1cfeb..49c88ce 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -705,8 +705,8 @@ proxy server for internet access. \fBINSTALL_MASK\fR = \fI[space delimited list of filename patterns (globs)]\fR Use this variable if you want to selectively prevent certain files from being copied into your file system tree. This does not work on -symlinks, but only on actual files. Useful if you wish to filter out -files like HACKING.gz and TODO.gz. +symlinks, but only on actual files (including directories). Useful if +you wish to filter out files like HACKING.gz and TODO.gz. Patterns are matched against both the absolute path and the bare filename of each file (or directory) to be installed.
[gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/
commit: 3ff375e832d469f03dc922f7a30651726f86d3e0
Author: Alexander Berntsen gentoo org>
AuthorDate: Mon Feb 1 16:37:48 2016 +
Commit: Alexander Berntsen gentoo org>
CommitDate: Tue Feb 2 10:08:47 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3ff375e8
Make config update tools stand out (bug 543706)
Add a CONFIGURATION FILES UPDATE TOOLS header to the manpage, to make
the tools discussion stand out from the configuration files discussion
in general.
Refer to the new section in emerge's configuration file updates output.
X-Gentoo-Bug: 543706
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=543706
Suggested-by: Julian Ospald gentoo.org>
Signed-off-by: Alexander Berntsen gentoo.org>
man/emerge.1 | 1 +
pym/_emerge/chk_updated_cfg_files.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/man/emerge.1 b/man/emerge.1
index 05b2a01..0f5782e 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1237,6 +1237,7 @@ add this to \fBmake.conf\fR(5):
.LP
.I CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d"
.LP
+.SH "CONFIGURATION FILES UPDATE TOOLS"
Tools such as dispatch\-conf, cfg\-update, and etc\-update are also available
to aid in the merging of these files. They provide interactive merging and can
auto\-merge trivial changes.
diff --git a/pym/_emerge/chk_updated_cfg_files.py
b/pym/_emerge/chk_updated_cfg_files.py
index 9f2ab6f..6903df9 100644
--- a/pym/_emerge/chk_updated_cfg_files.py
+++ b/pym/_emerge/chk_updated_cfg_files.py
@@ -36,7 +36,7 @@ def chk_updated_cfg_files(eroot, config_protect):
if result:
print(" " + yellow("*") + " See the " +
- colorize("INFORM", _("CONFIGURATION FILES")) +
- " " + _("section of the") + " " + bold("emerge"))
- print(" " + yellow("*") + " " +
+ colorize("INFORM", _("CONFIGURATION FILES")) + " and " +
+ colorize("INFORM", _("CONFIGURATION FILES UPDATE
TOOLS")))
+ print(" " + yellow("*") + " sections of the " + bold("emerge")
+ " " +
_("man page to learn how to update config files."))
[gentoo-commits] proj/portage:master commit in: /
commit: 9f5ec140785302acf924180dc413fb1b863ee900 Author: Alexander Berntsen gentoo org> AuthorDate: Fri Jan 29 11:17:22 2016 + Commit: Alexander Berntsen gentoo org> CommitDate: Fri Jan 29 11:17:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9f5ec140 Merge remote-tracking branch 'origin/master'
[gentoo-commits] proj/portage:master commit in: bin/
commit: f0ce7366b137119f087974d52ae807940e74ed56
Author: Ulrich Müller gentoo org>
AuthorDate: Wed Jan 27 21:05:51 2016 +
Commit: Alexander Berntsen gentoo org>
CommitDate: Thu Jan 28 12:08:36 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f0ce7366
isolated-functions.sh: Output error message for nofatal die.
X-Gentoo-Bug: 573056
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=573056
Signed-off-by: Alexander Berntsen gentoo.org>
Acked-by: Alexander Berntsen gentoo.org>
Acked-by: Brian Dolbecgentoo.org>
bin/isolated-functions.sh | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 5766921..e320f71 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}/eapi.sh" || exit 1
@@ -124,10 +124,11 @@ die() {
set +x # tracing only produces useless noise here
local IFS=$' \t\n'
- if ___eapi_die_can_respect_nonfatal; then
- if [[ ${1} == -n ]]; then
- [[ ${PORTAGE_NONFATAL} == 1 ]] && return 1
- shift
+ if ___eapi_die_can_respect_nonfatal && [[ $1 == -n ]]; then
+ shift
+ if [[ ${PORTAGE_NONFATAL} == 1 ]]; then
+ [[ $# -gt 0 ]] && eerror "$*"
+ return 1
fi
fi
[gentoo-commits] proj/portage:master commit in: pym/_emerge/
commit: 9c9165fb9420a285e8e2c62cb9ba8eb91120cb66
Author: Alexander Berntsen gentoo org>
AuthorDate: Wed Jan 27 08:51:25 2016 +
Commit: Alexander Berntsen gentoo org>
CommitDate: Thu Jan 28 11:50:58 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9c9165fb
Clarify no binary packages error (bug 573070)
Make emerge specify that it did not find any *binary packages* when
--usepkg is active, as opposed to that it did not find any *ebuilds*, as
this was confusing behaviour.
X-Gentoo-Bug: 573070
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=573070
Signed-off-by: Alexander Berntsen gentoo.org>
Acked-by: Brian Dolbecgentoo.org>
pym/_emerge/depgraph.py | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index d971749..05d1da5 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5125,7 +5125,10 @@ class depgraph(object):
cp_exists = True
break
- writemsg("\nemerge: there are no ebuilds to satisfy
"+green(xinfo)+".\n", noiselevel=-1)
+ writemsg("\nemerge: there are no %s to satisfy " %
+("binary packages" if
+ self._frozen_config.myopts.get("--usepkgonly", "y") == True
+ else "ebuilds") + green(xinfo) + ".\n", noiselevel=-1)
if isinstance(myparent, AtomArg) and \
not cp_exists and \
self._frozen_config.myopts.get(
[gentoo-commits] proj/portage:master commit in: /
commit: a90280cbc9c31a7d22fa192156e4b96bf3c7e1ef Author: Alexander Berntsen gentoo org> AuthorDate: Thu Jan 28 11:53:32 2016 + Commit: Alexander Berntsen gentoo org> CommitDate: Thu Jan 28 11:53:32 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a90280cb Merge branch '573070' pym/_emerge/depgraph.py | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)
[gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/
commit: 51f100e42753d6ffd3a24dfcb2ff8af0aa34966e
Author: Lucian Poston gmail com>
AuthorDate: Sat Jan 2 23:05:28 2016 +
Commit: Alexander Berntsen gentoo org>
CommitDate: Mon Jan 4 10:34:55 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=51f100e4
emerge: Add --autounmask-only parameter (bug 570672)
The --autounmask-only parameter will display autounmask messages,
perform autounmasking (in accordance with the other --autounmask-*
parameters), and exit with success (return value 0).
X-Gentoo-Bug: 570672
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=570672
man/emerge.1 | 6 ++
pym/_emerge/actions.py | 4
pym/_emerge/main.py| 11 +++
3 files changed, 21 insertions(+)
diff --git a/man/emerge.1 b/man/emerge.1
index c03f044..05b2a01 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -361,6 +361,12 @@ the specified configuration file(s), or enable the
\fBEMERGE_DEFAULT_OPTS\fR variable may be used to
disable this option by default in \fBmake.conf\fR(5).
.TP
+.BR "\-\-autounmask\-only [ y | n ]"
+Instead of doing any package building, just unmask
+packages and generate package.use settings as necessary
+to satisfy dependencies. This option is disabled by
+default.
+.TP
.BR "\-\-autounmask\-unrestricted\-atoms [ y | n ]"
If \-\-autounmask is enabled, keyword and mask changes
using the \'=\' operator will be written. With this
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index c3b0b98..59626ad 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -327,6 +327,10 @@ def action_build(settings, trees, mtimedb,
display_missing_pkg_set(root_config, e.value)
return 1
+ if "--autounmask-only" in myopts:
+ mydepgraph.display_problems()
+ return 0
+
if not success:
mydepgraph.display_problems()
return 1
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 5a8b93c..5dbafee 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -127,6 +127,7 @@ def insert_optional_args(args):
'--alert': y_or_n,
'--ask' : y_or_n,
'--autounmask' : y_or_n,
+ '--autounmask-only' : y_or_n,
'--autounmask-keep-masks': y_or_n,
'--autounmask-unrestricted-atoms' : y_or_n,
'--autounmask-write' : y_or_n,
@@ -323,6 +324,11 @@ def parse_opts(tmpcmdline, silent=False):
"choices" : true_y_or_n
},
+ "--autounmask-only": {
+ "help": "only perform --autounmask",
+ "choices" : true_y_or_n
+ },
+
"--autounmask-unrestricted-atoms": {
"help": "write autounmask changes with >= atoms if
possible",
"choices" : true_y_or_n
@@ -745,6 +751,11 @@ def parse_opts(tmpcmdline, silent=False):
if myoptions.autounmask in true_y:
myoptions.autounmask = True
+ if myoptions.autounmask_only in true_y:
+ myoptions.autounmask_only = True
+ else:
+ myoptions.autounmask_only = None
+
if myoptions.autounmask_unrestricted_atoms in true_y:
myoptions.autounmask_unrestricted_atoms = True
[gentoo-commits] proj/portage:master commit in: man/
commit: 1a07f62c987622267c0142f0e96a7bb204bd8926 Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Thu Jun 18 12:16:52 2015 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Thu Jun 18 12:27:17 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1a07f62c man/repoman.1: Fix deprecated java-devel link Signed-off-by: Alexander Berntsen bernalex AT gentoo.org man/repoman.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/repoman.1 b/man/repoman.1 index 54e677e..abd998b 100644 --- a/man/repoman.1 +++ b/man/repoman.1 @@ -1,4 +1,4 @@ -.TH REPOMAN 1 May 2015 Portage VERSION Portage +.TH REPOMAN 1 Jun 2015 Portage VERSION Portage .SH NAME repoman \- Gentoo's program to enforce a minimal level of quality assurance in packages added to the portage tree @@ -339,7 +339,7 @@ Ebuild inherits a deprecated eclass .TP .B java.eclassesnotused With virtual/jdk in DEPEND you must inherit a java eclass. Refer to -\fIhttp://www.gentoo.org/proj/en/java/java\-devel.xml\fR for more information. +\fIhttps://wiki.gentoo.org/wiki/Project:Java\fR for more information. .TP .B manifest.bad Manifest has missing or incorrect digests
[gentoo-commits] proj/portage:master commit in: man/
commit: 8c0c7b8502df0c46915aaa763cd8379bb012ee15 Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Tue May 19 10:46:34 2015 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Tue May 19 10:46:34 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8c0c7b85 man: Update copyright headers for recent commits Update copyright headers for some of our manpages, as some recent commits made changes that are probably big enough to warrant this. The relevant commits are included below. emaint.1: Update man page for better clarity (540482): 44f2a48390909050dd42404de9136bf78c97928e man/egencache.1: Add missed --write-timestamp option (540482): 465565a0f90843133ae1ae9072244d34d82eaf73 man: Add short option (-f) for repoman --force: e332dd6b73855096032f883d47246f39fc0ee14a man: Document repoman --straight-to-stabl fe59f38a84d7b22bb99d7e62e0324916c74f32a9 Signed-off-by: Alexander Berntsen bernalex AT gentoo.org man/egencache.1 | 2 +- man/emaint.1| 2 +- man/repoman.1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/egencache.1 b/man/egencache.1 index daf08aa..abbbdb9 100644 --- a/man/egencache.1 +++ b/man/egencache.1 @@ -1,4 +1,4 @@ -.TH EGENCACHE 1 Jul 2013 Portage VERSION Portage +.TH EGENCACHE 1 Mar 2015 Portage VERSION Portage .SH NAME egencache \- generate metadata cache for ebuild repositories .SH SYNOPSIS diff --git a/man/emaint.1 b/man/emaint.1 index 9d8de55..9a31635 100644 --- a/man/emaint.1 +++ b/man/emaint.1 @@ -1,4 +1,4 @@ -.TH EMAINT 1 Jan 2015 Portage VERSION Portage +.TH EMAINT 1 Mar 2015 Portage VERSION Portage .SH NAME emaint \- performs package managment related system health checks and maintenance .SH SYNOPSIS diff --git a/man/repoman.1 b/man/repoman.1 index 6a60e5c..54e677e 100644 --- a/man/repoman.1 +++ b/man/repoman.1 @@ -1,4 +1,4 @@ -.TH REPOMAN 1 Aug 2013 Portage VERSION Portage +.TH REPOMAN 1 May 2015 Portage VERSION Portage .SH NAME repoman \- Gentoo's program to enforce a minimal level of quality assurance in packages added to the portage tree
[gentoo-commits] proj/portage:master commit in: pym/_emerge/
commit: eccdfdfea08de3581b4d6864f560384b97088e50 Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Fri Feb 13 17:40:23 2015 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Fri Feb 13 18:43:36 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=eccdfdfe Add early check for broken /dev/s (bug 538980) Signed-off-by: Alexander Berntsen bernalex AT gentoo.org Suggested-by: Zac Medico zmedico AT gentoo.org ACKed-by: Zac Medico zmedico AT gentoo.org --- pym/_emerge/main.py | 14 ++ 1 file changed, 14 insertions(+) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 5d5e936..f1a9e18 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1100,6 +1100,20 @@ def emerge_main(args=None): # loading to allow new repos with non-existent directories portage._sync_mode = True + # Verify that /dev/null exists and is a device file as a cheap early + # filter for obviously broken /dev/s. + try: + if os.stat(os.devnull).st_rdev == 0: + writemsg_level(Failed to validate a sane '/dev'.\n + '/dev/null' is not a device file.\n, + level=logging.ERROR, noiselevel=-1) + return 1 + except OSError: + writemsg_level(Failed to validate a sane '/dev'.\n +'/dev/null' does not exist.\n, +level=logging.ERROR, noiselevel=-1) + return 1 + # Portage needs to ensure a sane umask for the files it creates. os.umask(0o22) emerge_config = load_emerge_config(
[gentoo-commits] proj/portage:master commit in: pym/_emerge/
commit: 7fab3aadb4cdca35ce0d81525af1256c745308ff Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Fri Feb 13 18:38:36 2015 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Fri Feb 13 18:43:36 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7fab3aad Add another check for broken /dev/s (bug 538980) Signed-off-by: Alexander Berntsen bernalex AT gentoo.org Suggested-by: Zac Medico zmedico AT gentoo.org ACKed-by: Zac Medico zmedico AT gentoo.org --- pym/_emerge/main.py | 9 + 1 file changed, 9 insertions(+) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index f1a9e18..84094ae 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1114,6 +1114,15 @@ def emerge_main(args=None): level=logging.ERROR, noiselevel=-1) return 1 + # Verify that BASH process substitution works as another cheap early + # filter. Process substitution uses '/dev/fd'. + if portage.process.spawn_bash([[ $( (echo foo) ) == foo ]]) != 0: + writemsg_level(Failed to validate a sane '/dev'.\n +bash process substitution doesn't work; this may be an +indication of a broken '/dev/fd'.\n, +level=logging.ERROR, noiselevel=-1) + return 1 + # Portage needs to ensure a sane umask for the files it creates. os.umask(0o22) emerge_config = load_emerge_config(
[gentoo-commits] proj/portage:master commit in: pym/_emerge/, /, man/
commit: 1f4cfaff9b6b6d340d3a8e495043b540a6d40e8d
Author: Alexander Berntsen bernalex AT gentoo DOT org
AuthorDate: Wed Oct 22 08:13:52 2014 +
Commit: Alexander Berntsen bernalex AT gentoo DOT org
CommitDate: Wed Oct 22 12:41:00 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1f4cfaff
Implement --rage-clean
Implement --rage-clean which lets you --unmerge really furiously. Works
like --unmerge but without a delay.
Signed-off-by: Alexander Berntsen bernalex AT gentoo.org
Acked-by: Zac Medico zmedico AT gentoo.org
---
RELEASE-NOTES | 4
man/emerge.1 | 15 ++-
pym/_emerge/actions.py | 14 +++---
pym/_emerge/main.py| 2 +-
pym/_emerge/unmerge.py | 35 +--
5 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 899b48a..7912398 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,10 @@
Release Notes; upgrade information mainly.
Features/major bugfixes are listed in NEWS
+portage-2.2.15
+==
+* New option --rage-clean that does --unmerge without delay.
+
portage-2.2.14
==
* Bug Fixes:
diff --git a/man/emerge.1 b/man/emerge.1
index 12e8b45..bbe71ac 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -258,11 +258,12 @@ portage tree as a tarball, which is much faster than
emerge
.TP
.BR \-\-unmerge (\fB\-C\fR)
\fBWARNING: This action can remove important packages!\fR Removes
-all matching packages. This does no checking of dependencies, so
-it may remove packages necessary for the proper operation of your
-system. Its arguments can be \fIatoms\fR or
-\fIebuilds\fR. For a dependency aware version of \fB\-\-unmerge\fR,
-use \fB\-\-depclean\fR or \fB\-\-prune\fR.
+all matching packages following a counter governed by \fBCLEAN_DELAY\fR.
+This does no checking of dependencies, so it may remove packages necessary
+for the proper operation of your system. Its arguments can be \fIatoms\fR
+or \fIebuilds\fR. For a dependency aware version of \fB\-\-unmerge\fR, use
+\fB\-\-depclean\fR or \fB\-\-prune\fR. For a version with
+\fBCLEAN_DELAY=0\fR, use \fB\-\-rage\-clean\fR.
.TP
.BR \-\-version (\fB\-V\fR)
Displays the version number of \fBemerge\fR.
@@ -716,6 +717,10 @@ Disable the warning message that's shown prior to
to be set in the \fBmake.conf\fR(5)
\fBEMERGE_DEFAULT_OPTS\fR variable.
.TP
+.BR \-\-rage\-clean
+\fBWARNING: This action can remove important packages!\fR
+\fB\-\-rage\-clean\fR does \fB\-\-unmerge\fR with \fBCLEAN_DELAY=0\fR.
+.TP
.BR \-\-read\-news [ y | n ]
Offer to read news via eselect if there are unread news. This option
has no effect unless \fB\-\-ask\fR is enabled.
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index ee57cec..48b0826 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2701,7 +2701,7 @@ def _sync_repo(emerge_config, repo):
def action_uninstall(settings, trees, ldpath_mtimes,
opts, action, files, spinner):
# For backward compat, some actions do not require leading '='.
- ignore_missing_eq = action in ('clean', 'unmerge')
+ ignore_missing_eq = action in ('clean', 'rage-clean', 'unmerge')
root = settings['ROOT']
eroot = settings['EROOT']
vardb = trees[settings['EROOT']]['vartree'].dbapi
@@ -2857,10 +2857,10 @@ def action_uninstall(settings, trees, ldpath_mtimes,
settings.backup_changes(PORTAGE_BACKGROUND)
settings.lock()
- if action in ('clean', 'unmerge') or \
+ if action in ('clean', 'rage-clean', 'unmerge') or \
(action == 'prune' and --nodeps in opts):
# When given a list of atoms, unmerge them in the order given.
- ordered = action == 'unmerge'
+ ordered = action in ('rage-clean', 'unmerge')
rval = unmerge(trees[settings['EROOT']]['root_config'], opts,
action,
valid_atoms, ldpath_mtimes, ordered=ordered,
scheduler=sched_iface)
@@ -3490,7 +3490,7 @@ def expand_set_arguments(myfiles, myaction, root_config):
for e in setconfig.errors:
print(colorize(BAD, Error during set creation: %s % e))
- unmerge_actions = (unmerge, prune, clean, depclean)
+ unmerge_actions = (unmerge, prune, clean, depclean,
rage-clean)
for a in myfiles:
if a.startswith(SETPREFIX):
@@ -3750,7 +3750,7 @@ def run_action(emerge_config):
# only expand sets for actions taking package arguments
oldargs = emerge_config.args[:]
if emerge_config.action in (clean, config, depclean,
- info, prune, unmerge, None):
+ info, prune, unmerge, rage-clean, None):
newargs, retval = expand_set_arguments(
emerge_config.args, emerge_config.action
[gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/
commit: 7d605312d48ae5f7755f640ef78c97b424399bd0
Author: Alexander Berntsen bernalex AT gentoo DOT org
AuthorDate: Mon Sep 29 10:20:03 2014 +
Commit: Alexander Berntsen bernalex AT gentoo DOT org
CommitDate: Mon Sep 29 22:12:09 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7d605312
Implement --read-news (off by default)
Turn off news-reading by default when --ask, and instead make it an
option --read-news.
Apparently making --ask a bit more interactive was goddamn stupid and
ruined the lives of several Gentoo developers. Props to Michał who
predicted this all along.
ACKed-by: Brian Dolbec dolsen AT gentoo.org
Signed-off-by: Alexander Berntsen bernalex AT gentoo.org
---
man/emerge.1 | 3 +++
pym/_emerge/actions.py | 2 +-
pym/_emerge/main.py| 13 +
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/man/emerge.1 b/man/emerge.1
index a2cb3f6..2264b58 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -716,6 +716,9 @@ Disable the warning message that's shown prior to
to be set in the \fBmake.conf\fR(5)
\fBEMERGE_DEFAULT_OPTS\fR variable.
.TP
+.BR \-\-read-news [ y | n ]
+Offer to read news via eselect if there are unread news.
+.TP
.BR \-\-rebuild\-if\-new\-slot [ y | n ]
Automatically rebuild or reinstall packages when slot/sub\-slot :=
operator dependencies can be satisfied by a newer slot, so that
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 9036810..4e8b83b 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -4064,7 +4064,7 @@ def run_action(emerge_config):
uq = UserQuery(emerge_config.opts)
if
display_news_notification(emerge_config.target_config,
emerge_config.opts) \
- and --ask in emerge_config.opts \
+ and --read-news in emerge_config.opts \
and uq.query(Would you like to read the news
items while \
calculating dependencies?,
'--ask-enter-invalid' in
emerge_config.opts) == Yes:
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 52aa9c5..3883f72 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -146,6 +146,7 @@ def insert_optional_args(args):
'--quiet': y_or_n,
'--quiet-build' : y_or_n,
'--quiet-fail' : y_or_n,
+ '--read-news': y_or_n,
'--rebuild-if-new-slot': y_or_n,
'--rebuild-if-new-rev' : y_or_n,
'--rebuild-if-new-ver' : y_or_n,
@@ -557,6 +558,12 @@ def parse_opts(tmpcmdline, silent=False):
choices : true_y_or_n,
},
+ --read-news: {
+ help: offer to read unread news via eselect,
+ choices : true_y_or_n
+ },
+
+
--rebuild-if-new-slot: {
help : (Automatically rebuild or reinstall
packages when slot/sub-slot :=
operator dependencies can be satisfied by a
newer slot, so that
@@ -803,6 +810,12 @@ def parse_opts(tmpcmdline, silent=False):
if myoptions.quiet_fail in true_y:
myoptions.quiet_fail = 'y'
+ if myoptions.read_news in true_y:
+ myoptions.read_news = True
+ else:
+ myoptions.read_news = None
+
+
if myoptions.rebuild_if_new_slot in true_y:
myoptions.rebuild_if_new_slot = 'y'
[gentoo-commits] proj/portage:master commit in: /
commit: e3eec598ad72c292bca9a1c5d23f0e5989bc78b3 Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Tue Aug 12 18:53:52 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Tue Aug 12 21:54:31 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e3eec598 Note the use of X-by in DEVELOPING Signed-off-by: Alexander Berntsen bernalex AT gentoo.org Reviewed-by: Brian Dolbec dolsen AT gentoo.org --- DEVELOPING | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/DEVELOPING b/DEVELOPING index 0ffcbd7..b1b3390 100644 --- a/DEVELOPING +++ b/DEVELOPING @@ -181,7 +181,18 @@ Commit messages should be in the imperative mood with a capitalised header, optionally followed by a newline and a more detailed explanatory text. The headline should be capped at 70 characters, the detailed text at 72. Prefix the message with the component you touched if this makes -sense. Postfix the message with the bug it fixes, if it does. Example: +sense. Postfix the message with the bug it fixes, if it does. + +Feel free to use the following notes (if applicable): +Signed-off-by: Wrote (a substantial portion of) the patch +Reviewed-by: Reviewed the patch thoroughly +Tested-by: Tested the patch thoroughly +Acked-by: Approved the concept but did not read the patch in detail +(typically used by the maintainer of a specific portion, or a lead) +Suggested-by: Designed the implementation +Reported-by: Reported the bug/feature request + +Example: emerge: Fix --tree output (bug 55) @@ -189,6 +200,10 @@ emerge: Fix --tree output (bug 55) Make sure newlines appear where they are supposed to. Fix a bug with colourisation of --tree output when used in tandem with --verbose --pretend --ask. + +Signed-off-by: Foo Bar f...@gentoo.org +Reviewed-by: Fu Baz f...@gentoo.org +Reported-by: Qux Quux q...@gentoo.org For a more detailed explanation (and rationalisation) of these rules:
[gentoo-commits] proj/portage:master commit in: /
commit: c315fd9e623f33dff2ba00ed758638cada04c547 Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Tue Aug 12 21:10:33 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Tue Aug 12 21:54:31 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c315fd9e DEVELOPING: Update RELEASE-NOTES NEWS in commit Signed-off-by: Alexander Berntsen bernalex AT gentoo.org Reviewed-by: Brian Dolbec dolsen AT gentoo.org --- DEVELOPING | 5 + 1 file changed, 5 insertions(+) diff --git a/DEVELOPING b/DEVELOPING index b1b3390..98c34b2 100644 --- a/DEVELOPING +++ b/DEVELOPING @@ -174,6 +174,11 @@ change a lot of unrelated things. This makes it easier to see what parts of the system have actually changed. It also makes it easier to cherry-pick and revert commits. Use your common sense! +When you make a significant change, make sure to update RELEASE-NOTES +for the to-be-released version. Very significant changes should be +mentioned in NEWS as well. See the current entries to these files for +examples of what constitutes significant. + Commit messages ---
[gentoo-commits] proj/portage:master commit in: /, bin/
commit: b5aba660b59271a21f9a0104680cee3472e8eebd
Author: Alexander Berntsen bernalex AT gentoo DOT org
AuthorDate: Tue Aug 12 21:18:35 2014 +
Commit: Alexander Berntsen bernalex AT gentoo DOT org
CommitDate: Tue Aug 12 21:54:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b5aba660
repoman: Disable DESCRIPTION.punctuation check
This reverts commits:
06637c4215d55c57517739214c6e0fd6f8f53914
repoman: Add DESCRIPTION.puntuation check (bug #438976)
0a2dab393f2ecf0476262620aa2e9a68d1f88a95
repoman: Add accidently deleted closing bracket ')'
bbb34efebd0bfc0b231073d00b863b3e3ebd918a
repoman: Do not report DESCRIPTION.punctuation warning for etc..
QA has requested these reverts, as they did not approve of this repoman
check.
Signed-off-by: Alexander Berntsen bernalex AT gentoo.org
Reviewed-by: Brian Dolbec dolsen AT gentoo.org
---
RELEASE-NOTES | 5 +
bin/repoman | 12
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9b4cbb7..22770ef 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,11 @@
Release Notes; upgrade information mainly.
Features/major bugfixes are listed in NEWS
+portage-2.2.13
+==
+* Bug Fixes:
+- Bug # 438976 Remove DESCRIPTION.punctuation check from repoman
+
portage-2.2.12
==
* Bug Fixes:
diff --git a/bin/repoman b/bin/repoman
index bd9ad15..5a6ee5b 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -319,7 +319,6 @@ qahelp = {
LICENSE.missing: Ebuilds that have a missing or empty LICENSE
variable,
LICENSE.virtual: Virtuals that have a non-empty LICENSE variable,
DESCRIPTION.missing: Ebuilds that have a missing or empty
DESCRIPTION variable,
- DESCRIPTION.punctuation: DESCRIPTION ends with a period character,
DESCRIPTION.toolong: DESCRIPTION is over %d characters %
max_desc_len,
EAPI.definition: EAPI definition does not conform to PMS section
7.3.1 (first non-comment, non-blank line),
EAPI.deprecated: Ebuilds that use features that are deprecated in
the current EAPI,
@@ -388,7 +387,6 @@ qawarnings = set((
dependency.badmaskedindev,
dependency.badtilde,
dependency.perlcore,
-DESCRIPTION.punctuation,
DESCRIPTION.toolong,
EAPI.deprecated,
HOMEPAGE.virtual,
@@ -1895,16 +1893,6 @@ for x in effective_scanlist:
stats[myqakey] += 1
fails[myqakey].append(relative_path)
- # Abbreviations usable at the end of sentence.
- abbreviations = (
- 'etc.',
- )
- if myaux['DESCRIPTION'][-1:] == '.' and not
myaux['DESCRIPTION'].split()[-1] in abbreviations:
- stats['DESCRIPTION.punctuation'] += 1
- fails['DESCRIPTION.punctuation'].append(
- %s: DESCRIPTION ends with a '%s' character
- % (relative_path, myaux['DESCRIPTION'][-1:]))
-
# 14 is the length of DESCRIPTION=
if len(myaux['DESCRIPTION']) max_desc_len:
stats['DESCRIPTION.toolong'] += 1
[gentoo-commits] proj/portage:master commit in: /
commit: ce5a35ec226a822d556af56fbf86430b9d72bfcd Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Tue Aug 12 22:38:39 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Tue Aug 12 22:38:39 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ce5a35ec DEVELOPING: Use Requested instead of Reported Signed-off-by: Alexander Berntsen bernalex AT gentoo.org --- DEVELOPING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPING b/DEVELOPING index 98c34b2..55470d8 100644 --- a/DEVELOPING +++ b/DEVELOPING @@ -195,7 +195,7 @@ Tested-by: Tested the patch thoroughly Acked-by: Approved the concept but did not read the patch in detail (typically used by the maintainer of a specific portion, or a lead) Suggested-by: Designed the implementation -Reported-by: Reported the bug/feature request +Requested-by: Reported the bug/made the feature request Example:
[gentoo-commits] proj/portage:master commit in: pym/_emerge/
commit: 910d073d04e01cbe24b300b9dc33697e9ca48b72
Author: Alexander Berntsen bernalex AT gentoo DOT org
AuthorDate: Thu Jun 12 16:53:50 2014 +
Commit: Alexander Berntsen bernalex AT gentoo DOT org
CommitDate: Mon Aug 11 20:22:19 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=910d073d
emerge: Prepend '=' to unmerge atoms (bug 512578)
Signed-off-by: Alexander Berntsen bernalex AT gentoo.org
Reviewed-By: Brian Dolbec dolsen AT gentoo.org
Reviewed-By: Michał Górny mgorny AT gentoo.org
---
pym/_emerge/unmerge.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index 8f98563..30b1930 100644
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -488,7 +488,8 @@ def _unmerge_display(root_config, myopts, unmerge_action,
if quiet:
writemsg_level(\n, noiselevel=-1)
- writemsg_level(\nAll selected packages: %s\n %
.join(all_selected), noiselevel=-1)
+ writemsg_level(\nAll selected packages: %s\n %
+.join('=%s' % x for x in all_selected),
noiselevel=-1)
writemsg_level(\n + colorize(UNMERGE_WARN, 'Selected') + \
packages are slated for removal.\n)
[gentoo-commits] proj/portage: New tag: v2.2.11
commit: Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Fri Aug 01 19:19:46 2014 + New tag: v2.2.11
[gentoo-commits] proj/portage:v2.2.11 commit in: /
commit: 89d02311f1c95329da3bb035f463f8de1d32e2ce Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Fri Aug 1 19:52:32 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Fri Aug 1 19:53:24 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=89d02311 Update release notes Signed-off-by: Alexander Berntsen bernalex AT gentoo.org --- RELEASE-NOTES | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 8d6abfc..63dbfad 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -11,9 +11,9 @@ portage-2.2.11 - Remove obsolete repoman eclass checks - Bug # 505944 Improve mismatch checking - Bug # 488820 fix @security crash -- Bug # 438976 Add DESCRIPTION.puntuation check to repoman +- Bug # 438976 Add DESCRIPTION.punctuation check to repoman - Add ruby18 warning for deprecated ruby target to repoman -- Add Python ersion to Portage version line +- Add Python version to Portage version line - Prevent rebuild code from performing unwanted repository changes - Include ::repository more consistently in output - Make the slot conflict handler output more debug information @@ -23,6 +23,9 @@ portage-2.2.11 - Implement --alert - Bug # 516428 Make repoman warn if non-virtuals depend on perl-core +- Prefer install-xattr to install.py as a wrapper to coreutils' +/usr/bin/install to preserve file system extended attribute. + portage-2.2.10 ==
[gentoo-commits] proj/portage:master commit in: /
commit: df52e14fc432fe72dee1c258b8d68bdb8503dd4c Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Thu Jul 31 15:38:36 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Thu Jul 31 15:44:33 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=df52e14f Update release notes Signed-off-by: Alexander Berntsen bernalex AT gentoo.org --- RELEASE-NOTES | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 44cb1c3..8d6abfc 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -8,9 +8,21 @@ portage-2.2.11 - Bug # 505428 RO only filesystem check - Bug # 506186 TaskSequence starting bug. - Sort repoman check output -- remove obsolete repoman eclass checks +- Remove obsolete repoman eclass checks - Bug # 505944 Improve mismatch checking - Bug # 488820 fix @security crash +- Bug # 438976 Add DESCRIPTION.puntuation check to repoman +- Add ruby18 warning for deprecated ruby target to repoman +- Add Python ersion to Portage version line +- Prevent rebuild code from performing unwanted repository changes +- Include ::repository more consistently in output +- Make the slot conflict handler output more debug information +- Bug # 487074 Don't split suggested commands when printing them +- Handle 'mkdir -p /etc/portage/make.profile/packages' gracefully + -- i.e. produce an error instead of crashing with a traceback +- Implement --alert +- Bug # 516428 Make repoman warn if non-virtuals depend on + perl-core portage-2.2.10 ==
[gentoo-commits] proj/portage:master commit in: bin/
commit: ea2d9c5a7da408437d36c3f14112088f905d57f1
Author: Andreas K. Huettel (dilfridge) dilfridge AT gentoo DOT org
AuthorDate: Mon Jul 21 20:22:36 2014 +
Commit: Alexander Berntsen bernalex AT gentoo DOT org
CommitDate: Fri Jul 25 16:11:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ea2d9c5a
repoman: Warn if virtuals depend on perl-core, bug 516428
Reported-by: Andreas K. Hüttel dilfridge AT gentoo.org
Authored-by: Andreas K. Hüttel dilfridge AT gentoo.org
Reviewed-by: Alexander Berntsen bernalex AT gentoo.org
Signed-off-by: Alexander Berntsen bernalex AT gentoo.org
---
bin/repoman | 9 +
1 file changed, 9 insertions(+)
diff --git a/bin/repoman b/bin/repoman
index c36ace1..9c5d720 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -299,6 +299,7 @@ qahelp = {
dependency.badindev: User-visible ebuilds with unsatisfied
dependencies (matched against *visible* ebuilds) in developing arch,
dependency.badmaskedindev: Masked ebuilds with unsatisfied
dependencies (matched against *all* ebuilds) in developing arch,
dependency.badtilde: Uses the ~ dep operator with a non-zero
revision part, which is useless (the revision is ignored),
+ dependency.perlcore: This ebuild directly depends on a package in
perl-core; it should use the corresponding virtual instead.,
dependency.syntax: Syntax error in dependency string (usually an
extra/missing space/parenthesis),
dependency.unknown: Ebuild has a dependency that refers to an
unknown package (which may be valid if it is a blocker for a renamed/removed
package, or is an alternative choice provided by an overlay),
file.executable: Ebuilds, digests, metadata.xml, Manifest, and
ChangeLog do not need the executable bit,
@@ -386,6 +387,7 @@ qawarnings = set((
dependency.badindev,
dependency.badmaskedindev,
dependency.badtilde,
+dependency.perlcore,
DESCRIPTION.punctuation,
DESCRIPTION.toolong,
EAPI.deprecated,
@@ -2058,6 +2060,13 @@ for x in effective_scanlist:
relative_path +
: %s: consider
using '%s' instead of '%s' %
(mytype,
suspect_virtual[atom.cp], atom))
+ if not is_blocker and \
+
atom.cp.startswith(perl-core/):
+
stats['dependency.perlcore'] += 1
+
fails['dependency.perlcore'].append(
+ relative_path +
+ : %s: please
use '%s' instead of '%s' %
+ (mytype,
atom.replace(perl-core/,virtual/perl-), atom))
if buildtime and \
not is_blocker and \
[gentoo-commits] proj/portage:master commit in: man/
commit: 4cbf3ef951c50f727dc23af99fac254b97814afd Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Sat Jul 19 13:49:53 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Sat Jul 19 13:49:53 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4cbf3ef9 man/repoman: Note line inaccuracies (bug 517416) Signed-off-by: Alexander Berntsen bernalex AT gentoo.org --- man/repoman.1 | 4 1 file changed, 4 insertions(+) diff --git a/man/repoman.1 b/man/repoman.1 index a78f94e..c576768 100644 --- a/man/repoman.1 +++ b/man/repoman.1 @@ -12,6 +12,10 @@ checks the quality of ebuild repositories. Note: \fBrepoman commit\fR only works \fIinside local\fR cvs, git, or subversion repositories. + +Note: Messages pertaining to specific lines may be inaccurate in the +prescence of continuation lines from use of the \fI\\\fR character in +BASH. .SH OPTIONS .TP \fB-a\fR, \fB--ask\fR
[gentoo-commits] proj/portage:master commit in: pym/_emerge/
commit: ab02c3fd788da6cc36188cdbee62a2b22bbc2474 Author: Alexander Berntsen alexander AT plaimi DOT net AuthorDate: Mon Oct 7 10:39:50 2013 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Sat Jun 14 20:46:28 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ab02c3fd emerge: Don't split suggestion (bug 487074) Signed-off-by: Alexander Berntsen bernalex AT gentoo.org --- pym/_emerge/actions.py | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index ff72d70..4ca2f1c 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -557,10 +557,9 @@ def action_depclean(settings, trees, ldpath_mtimes, msg.append(\n) msg.append(As a safety measure, depclean will not remove any packages\n) msg.append(unless *all* required dependencies have been resolved. As a\n) - msg.append(consequence, it is often necessary to run %s\n % \ - good(`emerge --update)) - msg.append(good(--newuse --deep @world`) + \ -prior to depclean.\n) + msg.append(consequence of this, it often becomes necessary to run \n) + msg.append(%s % good(`emerge --update --newuse --deep @world`) + + prior to depclean.\n) if action == depclean and --quiet not in myopts and not myfiles: portage.writemsg_stdout(\n)
[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/, bin/, pym/portage/, pym/portage/util/
commit: 55b2e1c0a51d64a84e5649c135cdbc2c650ce6ca
Author: Alexander Berntsen bernalex AT gentoo DOT org
AuthorDate: Fri May 16 14:06:31 2014 +
Commit: Alexander Berntsen bernalex AT gentoo DOT org
CommitDate: Sat Jun 14 20:48:42 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=55b2e1c0
Turn a traceback into a graceful error
Prior to this patch, the following would traceback:
mkdir -p /etc/portage/make.profile/packages
emerge foo
This patch turns such a traceback into an error by implementing
IsADirectory error handling.
Signed-off-by: Alexander Berntsen bernalex AT gentoo.org
---
bin/emerge | 9 -
pym/portage/exception.py | 4
pym/portage/package/ebuild/config.py | 13 ++---
pym/portage/util/__init__.py | 3 ++-
4 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/bin/emerge b/bin/emerge
index bb93d83..7773f7f 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -45,12 +45,19 @@ try:
from _emerge.main import emerge_main
if __name__ == __main__:
- from portage.exception import ParseError, PermissionDenied
+ from portage.exception import IsADirectory, ParseError, \
+ PermissionDenied
try:
retval = emerge_main()
except PermissionDenied as e:
sys.stderr.write(Permission denied: '%s'\n % str(e))
sys.exit(e.errno)
+ except IsADirectory as e:
+ sys.stderr.write('%s' is a directory, but should be a
file!\n
+ See portage man page for information
on
+ which files may be directories.\n %
+ str(e))
+ sys.exit(e.errno)
except ParseError as e:
sys.stderr.write(%s\n % str(e))
sys.exit(1)
diff --git a/pym/portage/exception.py b/pym/portage/exception.py
index 6fa5447..ef62e7a 100644
--- a/pym/portage/exception.py
+++ b/pym/portage/exception.py
@@ -84,6 +84,10 @@ class FileNotFound(InvalidLocation):
class DirectoryNotFound(InvalidLocation):
A directory was not found when it was expected to exist
+class IsADirectory(PortageException):
+ A directory was found when it was expected to be a file
+ from errno import EISDIR as errno
+
class OperationNotPermitted(PortageException):
An operation was not permitted operating system
from errno import EPERM as errno
diff --git a/pym/portage/package/ebuild/config.py
b/pym/portage/package/ebuild/config.py
index e104501..f639e14 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -37,7 +37,8 @@ from portage.dep import Atom, isvalidatom, match_from_list,
use_reduce, _repo_se
from portage.eapi import eapi_exports_AA, eapi_exports_merge_type, \
eapi_supports_prefix, eapi_exports_replace_vars, _get_eapi_attrs
from portage.env.loaders import KeyValuePairFileLoader
-from portage.exception import InvalidDependString, PortageException
+from portage.exception import InvalidDependString, IsADirectory, \
+ PortageException
from portage.localization import _
from portage.output import colorize
from portage.process import fakeroot_capable, sandbox_capable
@@ -556,8 +557,14 @@ class config(object):
self.profile_path = locations_manager.profile_path
self.user_profile_dir =
locations_manager.user_profile_dir
- packages_list = [grabfile_package(os.path.join(x,
packages),
- verify_eapi=True) for x in self.profiles]
+ try:
+ packages_list =
[grabfile_package(os.path.join(x, packages),
+ verify_eapi=True) for x in
self.profiles]
+ except IOError as e:
+ if e.errno == IsADirectory.errno:
+ raise
IsADirectory(os.path.join(self.profile_path,
+
packages))
+
self.packages = tuple(stack_lists(packages_list,
incremental=1))
# revmaskdict
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index 614b2b3..4105c19 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -43,7 +43,8 @@ from portage import _unicode_encode
from portage import _unicode_decode
from portage.const import VCS_DIRS
from portage.exception import InvalidAtom, PortageException, FileNotFound, \
- OperationNotPermitted, ParseError, PermissionDenied, ReadOnlyFileSystem
+ IsADirectory, OperationNotPermitted, ParseError
[gentoo-commits] proj/portage:master commit in: pym/portage/_sets/, pym/portage/package/ebuild/
commit: e3ecbad92c28d793a073019e7df81bb5ec84cc81 Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Fri May 16 13:32:43 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Sat Jun 14 20:48:35 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e3ecbad9 Revert 'packages' profile as directory patches This reverts commit 0c416cbb70858a5db2a1a23b2e90a95c0a1f2ea8 and b4d8e300c04b768be7cd5c64116d6cc0453219b4. Jorge Manuel B. S. Vicetto pointed out[0] that this is not useful. The commits were made by me after talking to Michael Palimaka on IRC. Apparently I did not get the full story straight, and made the commits prematurely. [0] https://bugs.gentoo.org/show_bug.cgi?id=282296#c14 Signed-off-by: Alexander Berntsen bernalex AT gentoo.org --- pym/portage/_sets/profiles.py| 4 +--- pym/portage/package/ebuild/config.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/portage/_sets/profiles.py b/pym/portage/_sets/profiles.py index 7135d7f..39a2968 100644 --- a/pym/portage/_sets/profiles.py +++ b/pym/portage/_sets/profiles.py @@ -33,9 +33,7 @@ class PackagesSystemSet(PackageSet): writemsg_level(\nPackagesSystemSet: profile paths: %s\n % \ (self._profile_paths,), level=logging.DEBUG, noiselevel=-1) - mylist = [grabfile_package(os.path.join(x, packages), -recursive=True, -verify_eapi=True) for x in self._profile_paths] + mylist = [grabfile_package(os.path.join(x, packages), verify_eapi=True) for x in self._profile_paths] if debug: writemsg_level(\nPackagesSystemSet: raw packages: %s\n % \ diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index e294968..e104501 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -557,7 +557,7 @@ class config(object): self.user_profile_dir = locations_manager.user_profile_dir packages_list = [grabfile_package(os.path.join(x, packages), - recursive=True, verify_eapi=True) for x in self.profiles] + verify_eapi=True) for x in self.profiles] self.packages = tuple(stack_lists(packages_list, incremental=1)) # revmaskdict
[gentoo-commits] proj/portage:master commit in: man/, pym/_emerge/
commit: 1a00ddf5fb089724a127c8dc72d63f10ae72abbf
Author: Alexander Berntsen bernalex AT gentoo DOT org
AuthorDate: Thu May 8 15:47:58 2014 +
Commit: Alexander Berntsen bernalex AT gentoo DOT org
CommitDate: Sat Jun 14 20:49:14 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1a00ddf5
emerge: Implement --alert
Implement --alert (short option -A), which adds a terminal bell
character ('\a') to all prompts, when it is set to True or y. It may
be used without an option, like e.g. --ask, to mean True.
The patch refactors userquery to a class, UserQuery, to accommodate
--alert. It also adds the option to the emerge man page.
A quick example is to do 'emerge -PAc portage'.
If you have your terminal emulator set up to make '\a' into a window
manager urgency hint, move your cursor to a different window to get the
effect. 'sleep 2 emerge' is another way to test this.
The --alert option is especially useful if you, like me, tend to fire up
a big world update when you get to the office in the morning (or night),
and then immediately change your focus to something else. If you now do
'emerge -auAD world', emerge will courteously point out when it has
finished calculating the graph, and again when it has finished emerging.
Signed-off-by: Alexander Berntsen bernalex AT gentoo.org
---
man/emerge.1 | 5
pym/_emerge/UserQuery.py | 71
pym/_emerge/actions.py | 19 -
pym/_emerge/depgraph.py | 9 --
pym/_emerge/main.py | 13 +
pym/_emerge/unmerge.py | 5 ++--
pym/_emerge/userquery.py | 55 -
7 files changed, 110 insertions(+), 67 deletions(-)
diff --git a/man/emerge.1 b/man/emerge.1
index abb0ed8..bbcf569 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -297,6 +297,11 @@ re\-distributable. With default
configuration, this would result in an effective
\fBACCEPT_RESTRICT\fR value of * -bindist.
.TP
+.BR \-\-alert
+Add a terminal bell character ('\\a') to all interactive prompts. This is
+especially useful if dependency resolution is taking a long time, and
+you want emerge to alert you when it is finished.
+.TP
.BR \-\-alphabetical
When displaying USE and other flag output, combines the enabled and
disabled lists into one list and sorts the whole list alphabetically.
diff --git a/pym/_emerge/UserQuery.py b/pym/_emerge/UserQuery.py
new file mode 100644
index 000..c866a0d
--- /dev/null
+++ b/pym/_emerge/UserQuery.py
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+from __future__ import print_function
+
+import signal
+import sys
+
+from portage.output import bold, create_color_func
+
+
+class UserQuery(object):
+ The UserQuery class is used to prompt the user with a set of
responses,
+ as well as accepting and handling the responses.
+
+ def __init__(self, myopts):
+ self.myopts = myopts
+
+ def query(self, prompt, enter_invalid, responses=None, colours=None):
+ Display a prompt and a set of responses, then waits for user
input
+ and check it against the responses. The first match is returned.
+
+ An empty response will match the first value in the list of
responses,
+ unless enter_invalid is True. The input buffer is *not* cleared
prior
+ to the prompt!
+
+ prompt: The String to display as a prompt.
+ responses: a List of Strings with the acceptable responses.
+ colours: a List of Functions taking and returning a String,
used to
+ process the responses for display. Typically these will be
functions
+ like red() but could be e.g. lambda x: DisplayString.
+
+ If responses is omitted, it defaults to [Yes, No], [green,
red].
+ If only colours is omitted, it defaults to [bold, ...].
+
+ Returns a member of the List responses. (If called without
optional
+ arguments, it returns Yes or No.)
+
+ KeyboardInterrupt is converted to SystemExit to avoid
tracebacks being
+ printed.
+ if responses is None:
+ responses = [Yes, No]
+ colours = [
+ create_color_func(PROMPT_CHOICE_DEFAULT),
+ create_color_func(PROMPT_CHOICE_OTHER)
+ ]
+ elif colours is None:
+ colours=[bold]
+ colours=(colours*len(responses))[:len(responses)]
+ if --alert in self.myopts:
+ prompt = '\a' + prompt
+ print(bold(prompt), end=' ')
+ try:
+ while True:
+ if sys.hexversion = 0x300
[gentoo-commits] proj/portage:master commit in: man/, pym/_emerge/
commit: 22637f20342dfd65d571212e9b426e697de1642a
Author: Alexander Berntsen bernalex AT gentoo DOT org
AuthorDate: Sat Jun 14 21:14:12 2014 +
Commit: Alexander Berntsen bernalex AT gentoo DOT org
CommitDate: Sat Jun 14 21:33:16 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=22637f20
Revert emerge: Implement --alert
This reverts commit 1a00ddf5fb089724a127c8dc72d63f10ae72abbf. It had
some furiously annoying mistakes in the commit message. Also, someone
alluded to the man page being too short. Thanks, Brian.
Signed-off-by: Alexander Berntsen bernalex AT gentoo.org
---
man/emerge.1 | 5
pym/_emerge/UserQuery.py | 71
pym/_emerge/actions.py | 19 +
pym/_emerge/depgraph.py | 9 ++
pym/_emerge/main.py | 13 -
pym/_emerge/unmerge.py | 5 ++--
pym/_emerge/userquery.py | 55 +
7 files changed, 67 insertions(+), 110 deletions(-)
diff --git a/man/emerge.1 b/man/emerge.1
index bbcf569..abb0ed8 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -297,11 +297,6 @@ re\-distributable. With default
configuration, this would result in an effective
\fBACCEPT_RESTRICT\fR value of * -bindist.
.TP
-.BR \-\-alert
-Add a terminal bell character ('\\a') to all interactive prompts. This is
-especially useful if dependency resolution is taking a long time, and
-you want emerge to alert you when it is finished.
-.TP
.BR \-\-alphabetical
When displaying USE and other flag output, combines the enabled and
disabled lists into one list and sorts the whole list alphabetically.
diff --git a/pym/_emerge/UserQuery.py b/pym/_emerge/UserQuery.py
deleted file mode 100644
index c866a0d..000
--- a/pym/_emerge/UserQuery.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-from __future__ import print_function
-
-import signal
-import sys
-
-from portage.output import bold, create_color_func
-
-
-class UserQuery(object):
- The UserQuery class is used to prompt the user with a set of
responses,
- as well as accepting and handling the responses.
-
- def __init__(self, myopts):
- self.myopts = myopts
-
- def query(self, prompt, enter_invalid, responses=None, colours=None):
- Display a prompt and a set of responses, then waits for user
input
- and check it against the responses. The first match is returned.
-
- An empty response will match the first value in the list of
responses,
- unless enter_invalid is True. The input buffer is *not* cleared
prior
- to the prompt!
-
- prompt: The String to display as a prompt.
- responses: a List of Strings with the acceptable responses.
- colours: a List of Functions taking and returning a String,
used to
- process the responses for display. Typically these will be
functions
- like red() but could be e.g. lambda x: DisplayString.
-
- If responses is omitted, it defaults to [Yes, No], [green,
red].
- If only colours is omitted, it defaults to [bold, ...].
-
- Returns a member of the List responses. (If called without
optional
- arguments, it returns Yes or No.)
-
- KeyboardInterrupt is converted to SystemExit to avoid
tracebacks being
- printed.
- if responses is None:
- responses = [Yes, No]
- colours = [
- create_color_func(PROMPT_CHOICE_DEFAULT),
- create_color_func(PROMPT_CHOICE_OTHER)
- ]
- elif colours is None:
- colours=[bold]
- colours=(colours*len(responses))[:len(responses)]
- if --alert in self.myopts:
- prompt = '\a' + prompt
- print(bold(prompt), end=' ')
- try:
- while True:
- if sys.hexversion = 0x300:
-
response=input([+/.join([colours[i](responses[i])
- for i in
range(len(responses))])+] )
- else:
-
response=raw_input([+/.join([colours[i](responses[i])
- for i
in range(len(responses))])+] )
- if response or not enter_invalid:
- for key in responses:
- # An empty response will match
the
- # first value in responses
[gentoo-commits] proj/portage:master commit in: man/
commit: b96fb047b342d055ef2a254bbdc2960c8ad9cc6e Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Sat Jun 14 21:52:48 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Sat Jun 14 21:52:48 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b96fb047 man/emerge.1: Make the --alert example more safe Signed-off-by: Alexander Berntsen bernalex AT gentoo.org Suggested-by: Steve J. Long slong AT rathaus.eclipse.co.uk --- man/emerge.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/emerge.1 b/man/emerge.1 index 1db41b0..e32bb43 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -306,7 +306,7 @@ finished calculating the graph. \fB--alert\fR may be 'y' or 'n'. 'true' and 'false' mean the same thing. Using \fB--alert\fR without an option is the same as using it with 'y'. -Try it with 'emerge -aAC gcc'. Remember to answer \fBno\fR! +Try it with 'emerge -aA portage'. If your terminal emulator is set up to make '\\a' into a window manager urgency hint, move your cursor to a different window to get the effect.
[gentoo-commits] proj/portage:master commit in: pym/portage/_sets/
commit: 0c416cbb70858a5db2a1a23b2e90a95c0a1f2ea8 Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Mon May 12 10:12:42 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Mon May 12 10:12:42 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0c416cbb Make b4d8e300c04b768be7cd5c respect max line width --- pym/portage/_sets/profiles.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pym/portage/_sets/profiles.py b/pym/portage/_sets/profiles.py index 48c29de..7135d7f 100644 --- a/pym/portage/_sets/profiles.py +++ b/pym/portage/_sets/profiles.py @@ -33,7 +33,9 @@ class PackagesSystemSet(PackageSet): writemsg_level(\nPackagesSystemSet: profile paths: %s\n % \ (self._profile_paths,), level=logging.DEBUG, noiselevel=-1) - mylist = [grabfile_package(os.path.join(x, packages), recursive=True, verify_eapi=True) for x in self._profile_paths] + mylist = [grabfile_package(os.path.join(x, packages), +recursive=True, +verify_eapi=True) for x in self._profile_paths] if debug: writemsg_level(\nPackagesSystemSet: raw packages: %s\n % \
[gentoo-commits] proj/portage:master commit in: pym/portage/_sets/, pym/portage/package/ebuild/
commit: b4d8e300c04b768be7cd5c64116d6cc0453219b4 Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Sun May 11 19:35:38 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Mon May 12 10:07:23 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b4d8e300 Support the 'packages' profile file as a directory This adds proof-of-concept support for bug #282296. Current behaviour without this change is to print a traceback. Reviewed-by: Alexander Berntsen bernalex AT gentoo.org --- pym/portage/_sets/profiles.py| 2 +- pym/portage/package/ebuild/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/_sets/profiles.py b/pym/portage/_sets/profiles.py index 39a2968..48c29de 100644 --- a/pym/portage/_sets/profiles.py +++ b/pym/portage/_sets/profiles.py @@ -33,7 +33,7 @@ class PackagesSystemSet(PackageSet): writemsg_level(\nPackagesSystemSet: profile paths: %s\n % \ (self._profile_paths,), level=logging.DEBUG, noiselevel=-1) - mylist = [grabfile_package(os.path.join(x, packages), verify_eapi=True) for x in self._profile_paths] + mylist = [grabfile_package(os.path.join(x, packages), recursive=True, verify_eapi=True) for x in self._profile_paths] if debug: writemsg_level(\nPackagesSystemSet: raw packages: %s\n % \ diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index e104501..e294968 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -557,7 +557,7 @@ class config(object): self.user_profile_dir = locations_manager.user_profile_dir packages_list = [grabfile_package(os.path.join(x, packages), - verify_eapi=True) for x in self.profiles] + recursive=True, verify_eapi=True) for x in self.profiles] self.packages = tuple(stack_lists(packages_list, incremental=1)) # revmaskdict
[gentoo-commits] proj/portage:master commit in: pym/_emerge/
commit: 027bac6855b66b7db997a9cf6b4e33ff7ee85ba2 Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Sat Apr 5 12:58:14 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Sat Apr 5 13:04:20 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=027bac68 depgraph: Improve mismatch checking (bug 505944) Make sure dep.atom and dep.atom.unevaluated_atom is set to something before checking for mismatch between them. This fixes a known bug where a typo like 'emerge -pvuDNworld' would produce a traceback if the user had a resume list. --- pym/_emerge/depgraph.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index abb70a7..737ed66 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2211,7 +2211,8 @@ class depgraph(object): # Display the specific atom from SetArg or # Package types. uneval = - if dep.atom is not dep.atom.unevaluated_atom: + if dep.atom and dep.atom.unevaluated_atom and \ + dep.atom is not dep.atom.unevaluated_atom: uneval = (%s) % (dep.atom.unevaluated_atom,) writemsg_level( %s%s%s required by %s\n %
[gentoo-commits] proj/portage:master commit in: /
commit: 8e3e0ac212a3847638c83edc1b752dadbfd5cd9d Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Thu Mar 27 12:42:33 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Sat Mar 29 00:01:04 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8e3e0ac2 DEVELOPING: Add note on commit messages --- DEVELOPING | 20 1 file changed, 20 insertions(+) diff --git a/DEVELOPING b/DEVELOPING index 9731610..cfa86a6 100644 --- a/DEVELOPING +++ b/DEVELOPING @@ -175,6 +175,26 @@ change a lot of unrelated things. This makes it easier to see what parts of the system have actually changed. It also makes it easier to cherry-pick and revert commits. Use your common sense! +Commit messages +--- + +Commit messages should be in the imperative mood with a capitalised +header, optionally followed by a newline and a more detailed explanatory +text. The headline should be capped at 50 characters, the detailed text +at 72. Prefix the message with the component you touched if this makes +sense. Postfix the message with the bug it fixes, if it does. Example: + + +emerge: Fix --tree output (bug 55) + +Make sure newlines appear where they are supposed to. Fix a bug with +colourisation of --tree output when used in tandem with --verbose +--pretend --ask. + + +For a more detailed explanation (and rationalisation) of these rules: +http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html + Releases
[gentoo-commits] proj/portage:master commit in: /
commit: ec8c4f4cd54f9311db3b8e6f634a77ec57674e3d Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Thu Mar 27 12:32:01 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Thu Mar 27 12:32:01 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ec8c4f4c DEVELOPING: Cap at 72 columns --- DEVELOPING | 73 +- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/DEVELOPING b/DEVELOPING index 40b4ca2..1f5087a 100644 --- a/DEVELOPING +++ b/DEVELOPING @@ -1,37 +1,39 @@ Code Guidelines --- -A few code guidelines to try to stick to, please comment if none of these make -sense, they are pretty basic and mostly apply to old code. However for people -who are looking at current code, they make take up bad habits that exist in the -current codebase. +A few code guidelines to try to stick to, please comment if none of +these make sense, they are pretty basic and mostly apply to old code. +However for people who are looking at current code, they make take up +bad habits that exist in the current codebase. Python Version -- -Python 2.6 is the minimum supported version, since it is the first version to -support Python 3 syntax. All exception handling should use Python 3 'except' -syntax, and the print function should be used instead of Python 2's print -statement (from __future__ import print_function). +Python 2.6 is the minimum supported version, since it is the first +version to support Python 3 syntax. All exception handling should use +Python 3 'except' syntax, and the print function should be used instead +of Python 2's print statement (from __future__ import print_function). Dependencies -Python and Bash should be the only hard dependencies. Any other dependencies, -including external Python modules that are not included with Python itself, -must be optionally enabled by run-time detection. +Python and Bash should be the only hard dependencies. Any other +dependencies, including external Python modules that are not included +with Python itself, must be optionally enabled by run-time detection. Tabs -The current code uses tabs, not spaces. Keep whitespace usage consistent -between files. New files should use tabs. Space is sometimes used for -indentation in Python code. Tab stop should for this reason be set to 4. +The current code uses tabs, not spaces. Keep whitespace usage +consistent between files. New files should use tabs. Space is +sometimes used for indentation in Python code. Tab stop should for this +reason be set to 4. Line-Wrapping - -Lines should typically not be longer than 80 characters; if they are an attempt -should be made to wrap them. Move code to the line below and indent once (\t). +Lines should typically not be longer than 80 characters; if they are an +attempt should be made to wrap them. Move code to the line below and +indent once (\t). errors.append(MalformedMetadata( errors.DESCRIPTION_TOO_LONG_ERROR % \ @@ -45,9 +47,10 @@ errors.append(MalformedMetadata( (length, max_desc_len), attr='DESCRIPTION.toolong') -The mixing of tabs and spaces means other developers can't read what you did. -This is why the python peps state spaces over tabs; because with spaces the line -wrapping is always clear (but you cannot convert spaces as easily as tabwidth). +The mixing of tabs and spaces means other developers can't read what you +did. This is why the python peps state spaces over tabs; because with +spaces the line wrapping is always clear (but you cannot convert spaces +as easily as tabwidth). Comparisons --- @@ -78,9 +81,9 @@ Generally you can do two things here, if you are messing with defaults.. dict.get(foo, some_default) -will try to retrieve foo from dict, if there is a KeyError, will insert foo -into dict with the value of some_default. This method is preferred in cases where -you are messing with defaults: +will try to retrieve foo from dict, if there is a KeyError, will insert +foo into dict with the value of some_default. This method is preferred +in cases where you are messing with defaults: try: dict[foo] @@ -114,7 +117,8 @@ YES: NO: import os,sys,time -When importing from a module, you may import more than 1 thing at a time. +When importing from a module, you may import more than 1 thing at a +time. YES: from portage.module import foo, bar, baz @@ -139,9 +143,9 @@ NO: import sys Try not to import large numbers of things into the namespace of a module. -I realize this is done all over the place in current code but it really makes it -a pain to do code reflection when the namespace is cluttered with identifiers -from other modules. +I realize this is done all over the place in current code but it really +makes it a pain to do code reflection
[gentoo-commits] proj/portage:master commit in: /
commit: 18c3f4f6149b8ca225dfb35c22dac0f330a7e825 Author: Alexander Berntsen bernalex AT gentoo DOT org AuthorDate: Thu Mar 27 12:42:15 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Fri Mar 28 23:57:09 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=18c3f4f6 DEVELOPING: Add note on commits --- DEVELOPING | 7 +++ 1 file changed, 7 insertions(+) diff --git a/DEVELOPING b/DEVELOPING index 1f5087a..9731610 100644 --- a/DEVELOPING +++ b/DEVELOPING @@ -167,6 +167,13 @@ when functions are needed and often unused functions are left in the import line until someone comes along with a linter to clean up (does not happen often). +Commits +--- + +Prefer small commits that change specific things to big commits that +change a lot of unrelated things. This makes it easier to see what +parts of the system have actually changed. It also makes it easier to +cherry-pick and revert commits. Use your common sense! Releases
[gentoo-commits] proj/portage:master commit in: pym/_emerge/
commit: e03499b7466bc053bc31ced89e4a890f516be7a3 Author: er...@falcon.eroen.eu eroen AT falcon DOT eroen DOT eu AuthorDate: Sun Mar 23 15:58:59 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Sun Mar 23 16:27:13 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e03499b7 pym/_emerge/main.py: Fix --moo output Fixes bug introduced by: * commit a830a9acaa265a9558f1fa9aeaa3f814631494b9 | Summary:Whitespace cleanup | Author: Brian Dolbec dolsen AT gentoo.org | AuthorDate: Mon Jan 6 23:56:30 2014 -0800 | CommitDate: Sat Mar 1 19:11:02 2014 -0800 --- pym/_emerge/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 38bbd77..cfe1332 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -81,7 +81,7 @@ COWSAY_MOO = --- \ ^__^ \ (oo)\___ -(__)\ )\/\ +(__)\ )\/\\ ||w | || ||
[gentoo-commits] proj/portage:master commit in: man/
commit: b68e09039821286daa7f8cfc8cd353a397fd4ddd Author: Alexander Berntsen alexander AT plaimi DOT net AuthorDate: Thu Mar 13 23:13:35 2014 + Commit: Alexander Berntsen bernalex AT gentoo DOT org CommitDate: Thu Mar 13 23:15:07 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b68e0903 man/make.conf.5: Fix misinformation (bug 504532) --- man/make.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/make.conf.5 b/man/make.conf.5 index 80f642f..2281014 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -392,7 +392,7 @@ for all EAPIs (for obvious reasons). .TP .B ipc\-sandbox Isolate the ebuild phase functions from host IPC namespace. Supported -only on Linux. Requires network namespace support in kernel. +only on Linux. Requires IPC namespace support in kernel. .TP .B lmirror When \fImirror\fR is enabled in \fBFEATURES\fR, fetch files even
