Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 267441 Details for
Bug 359675
sys-devel/libtool-2.2.10 fails with "Parse error in '/var/db/pkg/sys-devel/libtool-2.2.10/CONTENTS"
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for portage-2.1.9.42
portage-2.1.9.42.patch (text/plain), 2.11 KB, created by
Zac Medico
on 2011-03-27 21:08:39 UTC
(
hide
)
Description:
patch for portage-2.1.9.42
Filename:
MIME Type:
Creator:
Zac Medico
Created:
2011-03-27 21:08:39 UTC
Size:
2.11 KB
patch
obsolete
>diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py >index ce94fa4..8ef7127 100644 >--- a/pym/portage/dbapi/vartree.py >+++ b/pym/portage/dbapi/vartree.py >@@ -1536,7 +1536,7 @@ class dblink(object): > showMessage(_("!!! FAILED prerm: %s\n") % \ > os.path.join(self.dbdir, "EAPI"), > level=logging.ERROR, noiselevel=-1) >- showMessage("%s\n" % (e,), >+ showMessage(_unicode_decode("%s\n") % (e,), > level=logging.ERROR, noiselevel=-1) > myebuildpath = None > >@@ -1669,7 +1669,7 @@ class dblink(object): > elog_process(self.mycpv, self.settings, > phasefilter=('prerm', 'postrm')) > >- if retval == os.EX_OK: >+ if retval == os.EX_OK and builddir_lock is not None: > # myebuildpath might be None, so ensure > # it has a sane value for the clean phase, > # even though it won't really be sourced. >diff --git a/pym/portage/exception.py b/pym/portage/exception.py >index 64d0f7b..7891120 100644 >--- a/pym/portage/exception.py >+++ b/pym/portage/exception.py >@@ -1,4 +1,4 @@ >-# Copyright 1998-2004 Gentoo Foundation >+# Copyright 1998-2011 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > > import signal >@@ -150,13 +150,24 @@ class UnsupportedAPIException(PortagePackageException): > def __init__(self, cpv, eapi): > self.cpv, self.eapi = cpv, eapi > def __str__(self): >+ eapi = self.eapi >+ if not isinstance(eapi, basestring): >+ eapi = str(eapi) >+ eapi = eapi.lstrip("-") > msg = _("Unable to do any operations on '%(cpv)s', since " > "its EAPI is higher than this portage version's. Please upgrade" > " to a portage version that supports EAPI '%(eapi)s'.") % \ >- {"cpv": self.cpv, "eapi": str(self.eapi).lstrip("-")} >- return msg >+ {"cpv": self.cpv, "eapi": eapi} >+ return _unicode_decode(msg, >+ encoding=_encodings['content'], errors='replace') > >+ if sys.hexversion < 0x3000000: >+ >+ __unicode__ = __str__ > >+ def __str__(self): >+ return _unicode_encode(self.__unicode__(), >+ encoding=_encodings['content'], errors='backslashreplace') > > class SignatureException(PortageException): > """Signature was not present in the checked file"""
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 359675
:
266659
|
266663
|
267389
|
267395
| 267441