9:54 a.m.
If a failure occured when trying to create the cache folder, mash would
just silently ignore the error and happily continue cranking along. It
might of course fail later on, but the problem is impossible to debug if
errors are silently suppressed.
However, if the error is merely that the directory already exists (as
opposed to a permission issue, for example), then that is fine to
ignore.
Likewise, if a failure occurs when trying to download, merely saying
"can't download" is not helpful. Adding the actual error message makes
it easier to figure out what went wrong.
---
mash/__init__.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/mash/__init__.py b/mash/__init__.py
index 566b8c1..27cdc47 100644
--- a/mash/__init__.py
+++ b/mash/__init__.py
@@ -12,6 +12,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+import errno
import glob
import os
import logging
@@ -269,8 +270,11 @@ class Mash:
path =
os.path.join(koji.pathinfo.build(builds_hash[pkg['build_id']]),
koji.pathinfo.rpm(pkg))
try:
os.mkdir(os.path.dirname(cachepath))
- except:
- pass
+ except Exception as e:
+ if e.errno != errno.EEXIST:
+ # If the directory already exists, that's fine
+ self.logger.error(e)
+
try:
result = urlgrabber.grabber.urlgrab(path, cachepath)
except:
@@ -279,8 +283,9 @@ class Mash:
path =
os.path.join(koji.pathinfo.build(builds_hash[pkg['build_id']]),
koji.pathinfo.rpm(pkg))
try:
result = urlgrabber.grabber.urlgrab(path, cachepath)
- except:
- self.logger.error("ERROR: can't download %s from
%s" % (nevra(pkg), path))
+ except Exception as e:
+ self.logger.error("ERROR: can't download %s from %s:
%s"
+ % (nevra(pkg), path, e))
return None
fd = open(result)
--
2.1.0
9:54 a.m.
New subject: [PATCH] Don't multilib PHP
https://bugzilla.redhat.com/show_bug.cgi?id=967477
---
mash/multilib.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mash/multilib.py b/mash/multilib.py
index f2594b0..018e7ab 100644
--- a/mash/multilib.py
+++ b/mash/multilib.py
@@ -185,7 +185,7 @@ class DevelMultilibMethod(RuntimeMultilibMethod):
self.name = 'devel'
def select(self, po):
- blacklist = ['dmraid-devel', 'kdeutils-devel',
'mkinitrd-devel', 'java-1.5.0-gcj-devel',
'java-1.7.0-icedtea-devel', 'php-devel',
'java-1.6.0-openjdk-devel',
+ blacklist = ['dmraid-devel', 'kdeutils-devel',
'mkinitrd-devel', 'java-1.5.0-gcj-devel',
'java-1.7.0-icedtea-devel', 'java-1.6.0-openjdk-devel',
'java-1.7.0-openjdk-devel',
'java-1.8.0-openjdk-devel' ]
whitelist = []
if po.name in blacklist:
@@ -202,6 +202,8 @@ class DevelMultilibMethod(RuntimeMultilibMethod):
return False
if p_name.endswith('-devel') or
p_name.endswith('-static'):
return True
+ if po.name.startswith('php-'):
+ return False
if po.name.endswith('-devel'):
return True
if po.name.endswith('-static'):
--
2.1.0
11:51 a.m.
New subject: [PATCH] Don't multilib PHP
On Mon, Sep 29, 2014 at 04:54:56PM +0200, Mathieu Bridon wrote:
https://bugzilla.redhat.com/show_bug.cgi?id=967477
---
mash/multilib.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mash/multilib.py b/mash/multilib.py
index f2594b0..018e7ab 100644
--- a/mash/multilib.py
+++ b/mash/multilib.py
@@ -185,7 +185,7 @@ class DevelMultilibMethod(RuntimeMultilibMethod):
self.name = 'devel'
def select(self, po):
- blacklist = ['dmraid-devel', 'kdeutils-devel',
'mkinitrd-devel', 'java-1.5.0-gcj-devel',
'java-1.7.0-icedtea-devel', 'php-devel',
'java-1.6.0-openjdk-devel',
+ blacklist = ['dmraid-devel', 'kdeutils-devel',
'mkinitrd-devel', 'java-1.5.0-gcj-devel',
'java-1.7.0-icedtea-devel', 'java-1.6.0-openjdk-devel',
'java-1.7.0-openjdk-devel',
'java-1.8.0-openjdk-devel' ]
whitelist = []
if po.name in blacklist:
@@ -202,6 +202,8 @@ class DevelMultilibMethod(RuntimeMultilibMethod):
return False
if p_name.endswith('-devel') or
p_name.endswith('-static'):
return True
+ if po.name.startswith('php-'):
+ return False
if po.name.endswith('-devel'):
return True
if po.name.endswith('-static'):
+1 for me
Pierre
12:09 p.m.
New subject: [PATCH] Don't multilib PHP
On Mon, Oct 27, 2014 at 05:51:43PM +0100, Pierre-Yves Chibon wrote:
On Mon, Sep 29, 2014 at 04:54:56PM +0200, Mathieu Bridon wrote:
> https://bugzilla.redhat.com/show_bug.cgi?id=967477
> ---
> mash/multilib.py | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/mash/multilib.py b/mash/multilib.py
> index f2594b0..018e7ab 100644
> --- a/mash/multilib.py
> +++ b/mash/multilib.py
> @@ -185,7 +185,7 @@ class DevelMultilibMethod(RuntimeMultilibMethod):
> self.name = 'devel'
>
> def select(self, po):
> - blacklist = ['dmraid-devel', 'kdeutils-devel',
'mkinitrd-devel', 'java-1.5.0-gcj-devel',
'java-1.7.0-icedtea-devel', 'php-devel',
'java-1.6.0-openjdk-devel',
> + blacklist = ['dmraid-devel', 'kdeutils-devel',
'mkinitrd-devel', 'java-1.5.0-gcj-devel',
'java-1.7.0-icedtea-devel', 'java-1.6.0-openjdk-devel',
> 'java-1.7.0-openjdk-devel',
'java-1.8.0-openjdk-devel' ]
> whitelist = []
> if po.name in blacklist:
> @@ -202,6 +202,8 @@ class DevelMultilibMethod(RuntimeMultilibMethod):
> return False
> if p_name.endswith('-devel') or
p_name.endswith('-static'):
> return True
> + if po.name.startswith('php-'):
> + return False
> if po.name.endswith('-devel'):
> return True
> if po.name.endswith('-static'):
+1 for me
+1 as well.
luke
6:20 p.m.
New subject: [PATCH] Don't multilib PHP
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This needs to be looked at more. we can not remove multilibed bits from
the release trees. We may get to a place where we break peoples
installs by switching off multilib mid life. we likely need this to be
controlled by a config option we can default to having it turned off.
but allow multilib of php still in f19 and f20.
Dennis
On Mon, 29 Sep 2014 16:54:56 +0200
Mathieu Bridon <bochecha(a)fedoraproject.org> wrote:
https://bugzilla.redhat.com/show_bug.cgi?id=967477
---
mash/multilib.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mash/multilib.py b/mash/multilib.py
index f2594b0..018e7ab 100644
--- a/mash/multilib.py
+++ b/mash/multilib.py
@@ -185,7 +185,7 @@ class DevelMultilibMethod(RuntimeMultilibMethod):
self.name = 'devel'
def select(self, po):
- blacklist = ['dmraid-devel', 'kdeutils-devel',
'mkinitrd-devel', 'java-1.5.0-gcj-devel',
'java-1.7.0-icedtea-devel',
'php-devel', 'java-1.6.0-openjdk-devel',
+ blacklist = ['dmraid-devel', 'kdeutils-devel',
'mkinitrd-devel', 'java-1.5.0-gcj-devel',
'java-1.7.0-icedtea-devel',
'java-1.6.0-openjdk-devel', 'java-1.7.0-openjdk-devel',
'java-1.8.0-openjdk-devel' ] whitelist = [] if po.name in blacklist:
@@ -202,6 +202,8 @@ class DevelMultilibMethod(RuntimeMultilibMethod):
return False
if p_name.endswith('-devel') or
p_name.endswith('-static'): return True
+ if po.name.startswith('php-'):
+ return False
if po.name.endswith('-devel'):
return True
if po.name.endswith('-static'):
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBAgAGBQJUVBkyAAoJEH7ltONmPFDR5YAP/1aUtYh89TKylP6TLu8zMxCz
LHWwPIJk6CcEo4s2fbJnKf+G2l1ygnlbOT25dPT3bPYSsIF86ISUtwuwx+DM8yCu
6tUq31LNBKujlSHjoKBc0ySA8GWNQmEBGVXTSaMc9ECRluj9E+Jxd3Xe+AcT3J+y
gaTfsJrdXOOlQ4ie7PH164cEQHl6iiUojS/7PWc6fpPbw6KH8EYVaJRU81v4fIFM
N+RBQ6Ya3uGS2KePDPM2+co1WhigKkv9Pz0ilr63tk/jfmEpi5pw4KXFp21JmAWC
9meKwR0VpKvs/IUhdrTe1Oa9TWc8TtMaOUClzhedm0Qm3ukXpJ2ziqEf0LFs8lvf
XgOL2PgsWVmxmpDj4Mv5sIEYEMMvPwcllRLDIxuYW4mJ+H2bo6seUP5DeO5VYuf5
kkBbwY+YhQ0moQjNFTSVg8p/1sutN429yLVALLe5ABM0suDnJyiRn9EcXV862ym5
bzSb1daCr4sNqJgsprx2KLgpVZXwaKAZlalf/Thi85DBiVBXWTVjDfjl4vT3urYX
EWW3RCQgIsJJ6Ft9/Rjm8uG4y1GXJHU6hJk79Vi/51r0N3sATGSoeS1LcWR2s79Q
IlIS5dNJp76RXW0oetQV0uAT2CjdT9ZbPHDL5akVx88IGIvD6rleDRnAayDamNfB
bFw2fuTCLQqpvW8+B3Ti
=td7W
-----END PGP SIGNATURE-----
6:32 p.m.
New subject: [PATCH] Don't multilib PHP
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Fri, 31 Oct 2014 18:20:17 -0500
Dennis Gilmore <dennis(a)ausil.us> wrote:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This needs to be looked at more. we can not remove multilibed bits
from the release trees. We may get to a place where we break peoples
installs by switching off multilib mid life. we likely need this to be
controlled by a config option we can default to having it turned off.
but allow multilib of php still in f19 and f20.
Dennis
for instance on my laptop running f21
ice-php.i686
ice-php-devel.i686
php-cli.i686
php-common.i686
php-devel.i686
php-mysqlnd.i686
php-pdo.i686
php-pecl-apcu.i686
php-pecl-apcu-devel.i686
php-pecl-cairo.i686
php-pecl-cairo-devel.i686
php-pecl-http.i686
php-pecl-http-devel.i686
php-pecl-igbinary.i686
php-pecl-igbinary-devel.i686
php-pecl-jsonc.i686
php-pecl-jsonc-devel.i686
php-pecl-judy.i686
php-pecl-judy-devel.i686
php-pecl-krb5.i686
php-pecl-krb5-devel.i686
php-pecl-msgpack.i686
php-pecl-msgpack-devel.i686
php-pecl-mysqlnd-ms.i686
php-pecl-mysqlnd-ms-devel.i686
php-pecl-mysqlnd-qc.i686
php-pecl-mysqlnd-qc-devel.i686
php-pecl-propro.i686
php-pecl-propro-devel.i686
php-pecl-raphf.i686
php-pecl-raphf-devel.i686
are available. we can change rawhide and f21 at this point but we
really can not break f19 and f20.
Dennis
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBAgAGBQJUVBwpAAoJEH7ltONmPFDRnWUP/jb9LuJLDB0OKNgBx2Jc/oEX
EhGexrM8iRc0uszGe3r6Zn4ekSLV8ehLwfE0xDXcqMIT+1K3rrVFwy51YZlgAIhR
D9GWcUJouymgoXpfvtjP3eUPUICZvBOfRJ9nQsGrM6FB/PQApXJuK2qaE+MIUsr1
v5fVJLxpfSLwKmgJ9B+3ZBRVVlezdZFJICLFJ4PkrWUv0SNmHVFycFqynxURnVUA
d+LcBAUQximFIR0ovmApvjHdYSkCoCHI5wbzwoT3p47n8ZWnpS1n+1N9uy5o5JAs
EfR3WLNC1PoQ4I2HqtClXkp9JF7XoPSMQKRr168981JLcYIQJd+CcoK+QZkLHf1E
exCGnqQKxKDYUxEuK4CjnLlA7Z6igwnhNVBUTwBEMb9ME9VFdTOyHYs5PRlKf+vS
xWG2mWHNktYbunhpZaFism6H9q8JlHqdqONcSM3RYoTkaiuF5+9/xqRud3xngcYW
pHCMP7kpTvljnrqz8dxR0J1n//Q1uc8v1yl3Bnt642cmrJnGvgXn8CDm9dSND1Il
pCHh23MbCpv5Pfsd/F5lWDsDS2kKVm/r1FpBN278aJBFxGgL/fQc+TvhkGPuLzs3
RUwXZuyJpDObmRM+BQWg94W9haFHv6GqsBQsNeAZhAtPfkRxUywoNAQbTo4y4XpY
HtAEKjgzJodhhXeMLIFP
=dqWg
-----END PGP SIGNATURE-----
11:49 a.m.
On Mon, Sep 29, 2014 at 04:54:55PM +0200, Mathieu Bridon wrote:
If a failure occured when trying to create the cache folder, mash
would
just silently ignore the error and happily continue cranking along. It
might of course fail later on, but the problem is impossible to debug if
errors are silently suppressed.
However, if the error is merely that the directory already exists (as
opposed to a permission issue, for example), then that is fine to
ignore.
Likewise, if a failure occurs when trying to download, merely saying
"can't download" is not helpful. Adding the actual error message makes
it easier to figure out what went wrong.
---
mash/__init__.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/mash/__init__.py b/mash/__init__.py
index 566b8c1..27cdc47 100644
--- a/mash/__init__.py
+++ b/mash/__init__.py
@@ -12,6 +12,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+import errno
import glob
import os
import logging
@@ -269,8 +270,11 @@ class Mash:
path =
os.path.join(koji.pathinfo.build(builds_hash[pkg['build_id']]),
koji.pathinfo.rpm(pkg))
try:
os.mkdir(os.path.dirname(cachepath))
- except:
- pass
+ except Exception as e:
+ if e.errno != errno.EEXIST:
+ # If the directory already exists, that's fine
+ self.logger.error(e)
+
try:
result = urlgrabber.grabber.urlgrab(path, cachepath)
except:
@@ -279,8 +283,9 @@ class Mash:
path =
os.path.join(koji.pathinfo.build(builds_hash[pkg['build_id']]),
koji.pathinfo.rpm(pkg))
try:
result = urlgrabber.grabber.urlgrab(path, cachepath)
- except:
- self.logger.error("ERROR: can't download %s from
%s" % (nevra(pkg), path))
+ except Exception as e:
+ self.logger.error("ERROR: can't download %s from %s:
%s"
+ % (nevra(pkg), path, e))
return None
fd = open(result)
+1 for me, looks good
Pierre
12:07 p.m.
Looks good to me, +1
On Mon, Sep 29, 2014 at 04:54:55PM +0200, Mathieu Bridon wrote:
If a failure occured when trying to create the cache folder, mash
would
just silently ignore the error and happily continue cranking along. It
might of course fail later on, but the problem is impossible to debug if
errors are silently suppressed.
However, if the error is merely that the directory already exists (as
opposed to a permission issue, for example), then that is fine to
ignore.
Likewise, if a failure occurs when trying to download, merely saying
"can't download" is not helpful. Adding the actual error message makes
it easier to figure out what went wrong.
---
mash/__init__.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/mash/__init__.py b/mash/__init__.py
index 566b8c1..27cdc47 100644
--- a/mash/__init__.py
+++ b/mash/__init__.py
@@ -12,6 +12,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+import errno
import glob
import os
import logging
@@ -269,8 +270,11 @@ class Mash:
path =
os.path.join(koji.pathinfo.build(builds_hash[pkg['build_id']]),
koji.pathinfo.rpm(pkg))
try:
os.mkdir(os.path.dirname(cachepath))
- except:
- pass
+ except Exception as e:
+ if e.errno != errno.EEXIST:
+ # If the directory already exists, that's fine
+ self.logger.error(e)
+
try:
result = urlgrabber.grabber.urlgrab(path, cachepath)
except:
@@ -279,8 +283,9 @@ class Mash:
path =
os.path.join(koji.pathinfo.build(builds_hash[pkg['build_id']]),
koji.pathinfo.rpm(pkg))
try:
result = urlgrabber.grabber.urlgrab(path, cachepath)
- except:
- self.logger.error("ERROR: can't download %s from
%s" % (nevra(pkg), path))
+ except Exception as e:
+ self.logger.error("ERROR: can't download %s from %s:
%s"
+ % (nevra(pkg), path, e))
return None
fd = open(result)
--
2.1.0
_______________________________________________
rel-eng mailing list
rel-eng(a)lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/rel-eng
6:17 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied upstream.
On Mon, 29 Sep 2014 16:54:55 +0200
Mathieu Bridon <bochecha(a)fedoraproject.org> wrote:
If a failure occured when trying to create the cache folder, mash
would just silently ignore the error and happily continue cranking
along. It might of course fail later on, but the problem is
impossible to debug if errors are silently suppressed.
However, if the error is merely that the directory already exists (as
opposed to a permission issue, for example), then that is fine to
ignore.
Likewise, if a failure occurs when trying to download, merely saying
"can't download" is not helpful. Adding the actual error message makes
it easier to figure out what went wrong.
---
mash/__init__.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/mash/__init__.py b/mash/__init__.py
index 566b8c1..27cdc47 100644
--- a/mash/__init__.py
+++ b/mash/__init__.py
@@ -12,6 +12,7 @@
# with this program; if not, write to the Free Software Foundation,
Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+import errno
import glob
import os
import logging
@@ -269,8 +270,11 @@ class Mash:
path =
os.path.join(koji.pathinfo.build(builds_hash[pkg['build_id']]),
koji.pathinfo.rpm(pkg)) try: os.mkdir(os.path.dirname(cachepath))
- except:
- pass
+ except Exception as e:
+ if e.errno != errno.EEXIST:
+ # If the directory already exists, that's
fine
+ self.logger.error(e)
+
try:
result = urlgrabber.grabber.urlgrab(path,
cachepath) except:
@@ -279,8 +283,9 @@ class Mash:
path =
os.path.join(koji.pathinfo.build(builds_hash[pkg['build_id']]),
koji.pathinfo.rpm(pkg)) try: result =
urlgrabber.grabber.urlgrab(path, cachepath)
- except:
- self.logger.error("ERROR: can't download %s
from %s" % (nevra(pkg), path))
+ except Exception as e:
+ self.logger.error("ERROR: can't download %s
from %s: %s"
+ % (nevra(pkg), path, e))
return None
fd = open(result)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBAgAGBQJUVBh7AAoJEH7ltONmPFDRE10P/Rr+Fk6gVtgtDEtfh7MnbtoO
y2PFgNH9Q5sH5FaecAhxiFXmbvklePaL9T4rqTLGDExQWe2bHQ2HHRv3USvrz8Wd
t+8BQJCS+Gfv5dpMjz6CkoUlpJCgMAw0VGZiCcpt+Sf7o3N8sbBo/ez1jDDobhbv
9Q5oMFxhVfPEJSmiQWrO4hzHnyP3QyeEzigXtUKqD5fxWzU01JQ9vfUfyFUGTnAa
nA1qcRZnggZCJDTylwU+pT9+h/o1x14zU6KGlUtAA5CdAasqhWWVxSkWbEO19baO
PzSgIFlk/m5BLctw4MEdvI6JCakG8Roksu7x/6QQ5Az8V/HOxV3oNR+8/nih3s/w
LinGLesj3bDS5pTEow+CYOMaGqixgVvc/TgJO2Q+EBEYcPiffHCrTjFlXJg5wpXk
R04mEFcM+znZ9BB6zb8OFGgQE/ESipvUfKC9kh0i1XeCEblKsrow77AVhPPViQCX
G+aZTmSGbyZU2HuMxM8gVNTPoiGY5a4SyD/E42zHhz4YETfFo3IDpIDQ1h2/HQTe
B1Aq42CNxb//v3kaHkviD4R6RmERBSgSJAsMAidtCdvpuJBabAZOxhIcU1dRT9ud
jDdRT5q8I0eddBGX0FI6VFsblXF4ig6bUxj+Me/r2H4J8SdrAZnbUxoPvxpCjv9c
wxqyxI6ELH+JXLwzgEv4
=NohB
-----END PGP SIGNATURE-----
3469
days inactive
3501
days old
rel-eng@lists.fedoraproject.org
8 comments
4 participants
participants (4)
-
Dennis Gilmore -
Luke Macken -
Mathieu Bridon -
Pierre-Yves Chibon