6:04 p.m.
From: Ric Holland <richard.holland(a)codethink.co.uk>
Repo: git://git.baserock.org/baserock/baserock/morph
Branch: baserock/richardholland/stop-morph-logging-gitmodule-error
Commit: 18ad8436b4d36ffec1a8940b3206dfbf56983b02
Ric Holland (1):
Changed the error message in log when morph fails to find gitmodules
morphlib/git.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
1.7.9.rc0.27.ge0b3e
6:04 p.m.
New subject: [PATCH] Changed the error message in log when morph fails to find gitmodules
From: Ric Holland <richard.holland(a)codethink.co.uk>
morph.log will now show an INFO message rther than a ERROR
---
morphlib/git.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/morphlib/git.py b/morphlib/git.py
index c491991..9cdd0a8 100644
--- a/morphlib/git.py
+++ b/morphlib/git.py
@@ -80,7 +80,7 @@ class Submodules(object):
# try to read the .gitmodules file from the repo/ref
content = self.app.runcmd(
['git', 'cat-file', 'blob',
'%s:.gitmodules' % self.ref],
- cwd=self.repo)
+ cwd=self.repo, ignore_fail=True)
# drop indentation in sections, as RawConfigParser cannot handle it
return '\n'.join([line.strip() for line in content.splitlines()])
--
1.7.9.rc0.27.ge0b3e
2:05 p.m.
New subject: [PATCH] Changed the error message in log when morph fails to find gitmodules
On 2013-03-19 17:04, Richard Holland wrote:
From: Ric Holland <richard.holland(a)codethink.co.uk>
morph.log will now show an INFO message rther than a ERROR
---
morphlib/git.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/morphlib/git.py b/morphlib/git.py
index c491991..9cdd0a8 100644
--- a/morphlib/git.py
+++ b/morphlib/git.py
@@ -80,7 +80,7 @@ class Submodules(object):
# try to read the .gitmodules file from the repo/ref
content = self.app.runcmd(
['git', 'cat-file', 'blob',
'%s:.gitmodules' %
self.ref],
- cwd=self.repo)
+ cwd=self.repo, ignore_fail=True)
# drop indentation in sections, as RawConfigParser
cannot handle it
return '\n'.join([line.strip() for line in
content.splitlines()])
The changes to the code don't seem to reflect the description for what
it
does. According to Lars, ignore_fail will not show an INFO message if
it
fails, but rather completely ignore a failure.
2:06 p.m.
New subject: [PATCH] Changed the error message in log when morph fails to find gitmodules
On Wed, Mar 20, 2013 at 01:05:02PM +0000, Jonathan Maw wrote:
On 2013-03-19 17:04, Richard Holland wrote:
>From: Ric Holland <richard.holland(a)codethink.co.uk>
>
>morph.log will now show an INFO message rther than a ERROR
>---
> morphlib/git.py | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/morphlib/git.py b/morphlib/git.py
>index c491991..9cdd0a8 100644
>--- a/morphlib/git.py
>+++ b/morphlib/git.py
>@@ -80,7 +80,7 @@ class Submodules(object):
> # try to read the .gitmodules file from the repo/ref
> content = self.app.runcmd(
> ['git', 'cat-file', 'blob',
'%s:.gitmodules' %
>self.ref],
>- cwd=self.repo)
>+ cwd=self.repo, ignore_fail=True)
>
> # drop indentation in sections, as RawConfigParser
>cannot handle it
> return '\n'.join([line.strip() for line in
>content.splitlines()])
The changes to the code don't seem to reflect the description for
what it
does. According to Lars, ignore_fail will not show an INFO message
if it
fails, but rather completely ignore a failure.
Yes, log_error=False is the right keyword argument.
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
2:57 p.m.
New subject: [PATCH] Changed the error message in log when morph fails to find gitmodules
On 20/03/13 13:06, Lars Wirzenius wrote:
On Wed, Mar 20, 2013 at 01:05:02PM +0000, Jonathan Maw wrote:
> On 2013-03-19 17:04, Richard Holland wrote:
>> From: Ric Holland <richard.holland(a)codethink.co.uk>
>>
>> morph.log will now show an INFO message rther than a ERROR
>> ---
>> morphlib/git.py | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/morphlib/git.py b/morphlib/git.py
>> index c491991..9cdd0a8 100644
>> --- a/morphlib/git.py
>> +++ b/morphlib/git.py
>> @@ -80,7 +80,7 @@ class Submodules(object):
>> # try to read the .gitmodules file from the repo/ref
>> content = self.app.runcmd(
>> ['git', 'cat-file', 'blob',
'%s:.gitmodules' %
>> self.ref],
>> - cwd=self.repo)
>> + cwd=self.repo, ignore_fail=True)
>>
>> # drop indentation in sections, as RawConfigParser
>> cannot handle it
>> return '\n'.join([line.strip() for line in
>> content.splitlines()])
> The changes to the code don't seem to reflect the description for
> what it
> does. According to Lars, ignore_fail will not show an INFO message
> if it
> fails, but rather completely ignore a failure.
Yes, log_error=False is the right keyword argument.
Getting this in morph.log during a build using the branch:
"2013-03-20 13:52:58 INFO Command failed: git cat-file blob
fd07d4ce8a07adccd3ef355814a07788504ae71f:.gitmodules
fatal: Not a valid object name
fd07d4ce8a07adccd3ef355814a07788504ae71f:.gitmodules"
Is this not what was wanted?
4:07 p.m.
New subject: [PATCH] Changed the error message in log when morph fails to find gitmodules
On Wed, Mar 20, 2013 at 01:57:11PM +0000, Ric Holland wrote:
On 20/03/13 13:06, Lars Wirzenius wrote:
>On Wed, Mar 20, 2013 at 01:05:02PM +0000, Jonathan Maw wrote:
>>On 2013-03-19 17:04, Richard Holland wrote:
>>>From: Ric Holland <richard.holland(a)codethink.co.uk>
>>>
>>>morph.log will now show an INFO message rther than a ERROR
>>>---
>>>morphlib/git.py | 2 +-
>>>1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>>diff --git a/morphlib/git.py b/morphlib/git.py
>>>index c491991..9cdd0a8 100644
>>>--- a/morphlib/git.py
>>>+++ b/morphlib/git.py
>>>@@ -80,7 +80,7 @@ class Submodules(object):
>>> # try to read the .gitmodules file from the repo/ref
>>> content = self.app.runcmd(
>>> ['git', 'cat-file', 'blob',
'%s:.gitmodules' %
>>>self.ref],
>>>- cwd=self.repo)
>>>+ cwd=self.repo, ignore_fail=True)
>>>
>>> # drop indentation in sections, as RawConfigParser
>>>cannot handle it
>>> return '\n'.join([line.strip() for line in
>>>content.splitlines()])
>>The changes to the code don't seem to reflect the description for
>>what it
>>does. According to Lars, ignore_fail will not show an INFO message
>>if it
>>fails, but rather completely ignore a failure.
>Yes, log_error=False is the right keyword argument.
>
Getting this in morph.log during a build using the branch:
"2013-03-20 13:52:58 INFO Command failed: git cat-file blob
fd07d4ce8a07adccd3ef355814a07788504ae71f:.gitmodules
fatal: Not a valid object name
fd07d4ce8a07adccd3ef355814a07788504ae71f:.gitmodules"
Is this not what was wanted?
Ah, yes, I see now where I was going wrong. You need ignore_errors=True
and log_error=True for the desired result. The latter is true by default,
and the patch correctly sets the former, so it should all be good.
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
3918
days inactive
3919
days old
5 comments
4 participants
participants (4)
-
Jonathan Maw -
Lars Wirzenius -
Ric Holland -
Richard Holland