From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/cache/
Date: Tue, 8 Feb 2011 06:37:35 +0000 (UTC) [thread overview]
Message-ID: <ad382da72d24dbd0df1ee3696aacd638171a1cda.zmedico@gentoo> (raw)
commit: ad382da72d24dbd0df1ee3696aacd638171a1cda
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 8 06:35:14 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Feb 8 06:35:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ad382da7
cache.ebuild_xattr: don't import ENODATA globally
ENODATA is undefined on FreeBSD. This will fix bug #354057.
---
pym/portage/cache/ebuild_xattr.py | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pym/portage/cache/ebuild_xattr.py b/pym/portage/cache/ebuild_xattr.py
index 1d7e26f..6b388fa 100644
--- a/pym/portage/cache/ebuild_xattr.py
+++ b/pym/portage/cache/ebuild_xattr.py
@@ -4,6 +4,8 @@
__all__ = ['database']
+import errno
+
import portage
from portage.cache import fs_template
from portage.versions import catsplit
@@ -11,7 +13,6 @@ from portage import cpv_getkey
from portage import os
from portage import _encodings
from portage import _unicode_decode
-from errno import ENODATA,ENOSPC,E2BIG
portage.proxy.lazyimport.lazyimport(globals(),
'xattr')
@@ -58,16 +59,16 @@ class database(fs_template.FsBased):
except IOError as e:
# ext based give wrong errno
# http://bugzilla.kernel.org/show_bug.cgi?id=12793
- if e.errno in (E2BIG,ENOSPC):
+ if e.errno in (errno.E2BIG, errno.ENOSPC):
result = len(s)-100
else:
- raise e
+ raise
try:
self.__remove(path,'test_max')
except IOError as e:
- if e.errno is not ENODATA:
- raise e
+ if e.errno != errno.ENODATA:
+ raise
return result
@@ -87,7 +88,7 @@ class database(fs_template.FsBased):
try:
return xattr.get(path,key,namespace=self.ns)
except IOError as e:
- if not default is None and ENODATA == e.errno:
+ if not default is None and errno.ENODATA == e.errno:
return default
else:
raise NoValueException()
next reply other threads:[~2011-02-08 6:37 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-08 6:37 Zac Medico [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-09-19 16:57 [gentoo-commits] proj/portage:master commit in: pym/portage/cache/ Zac Medico
2016-07-24 23:22 Zac Medico
2016-07-13 11:32 Zac Medico
2015-12-29 16:42 Zac Medico
2015-12-29 16:42 Zac Medico
2015-12-29 16:42 Zac Medico
2014-11-14 17:33 Zac Medico
2013-07-26 8:23 Arfrever Frehtes Taifersar Arahesis
2013-07-26 7:57 Zac Medico
2013-01-18 17:12 Zac Medico
2013-01-18 16:37 Zac Medico
2013-01-18 15:32 Zac Medico
2012-11-21 4:38 Zac Medico
2012-10-02 20:30 Zac Medico
2012-09-25 3:44 Zac Medico
2012-09-25 1:54 Zac Medico
2012-09-25 1:42 Zac Medico
2012-09-18 19:02 Zac Medico
2012-06-10 8:35 Zac Medico
2012-06-10 8:28 Zac Medico
2012-06-10 8:25 Zac Medico
2012-05-24 19:06 Zac Medico
2012-05-23 19:00 Zac Medico
2011-10-29 23:10 Zac Medico
2011-10-18 5:26 Zac Medico
2011-10-14 15:30 Zac Medico
2011-09-07 15:56 Zac Medico
2011-05-12 19:05 Zac Medico
2011-05-12 19:02 Zac Medico
2011-05-12 19:02 Zac Medico
2011-02-07 0:14 Zac Medico
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ad382da72d24dbd0df1ee3696aacd638171a1cda.zmedico@gentoo \
--to=zmedico@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox