[opensuse-buildservice] Re: [PATCH] - do_update: use "rev" instead of "lsrcmd5" when running "osc up -u"
On Tue, Mar 27, 2012 at 06:07:40PM +0200, OBS osc wrote:
From: Marcus Huewe
--- osc/commandline.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/osc/commandline.py b/osc/commandline.py index cf277df..59ce30a 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -4048,7 +4048,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. elif opts.unexpand_link and p.islink() and p.isexpanded(): print 'Unexpanding to rev', p.linkinfo.lsrcmd5 p.update(rev, opts.server_side_source_service_files, opts.limit_size) - rev = p.linkinfo.lsrcmd5 + # XXX: calling update again is redundant (see below) + rev = p.rev
Are you sure that there p.rev really is different from p.srcmd5? M. -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On Wed, Mar 28, 2012 at 11:52:59AM +0200, Michael Schroeder wrote:
On Tue, Mar 27, 2012 at 06:07:40PM +0200, OBS osc wrote:
From: Marcus Huewe
--- osc/commandline.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/osc/commandline.py b/osc/commandline.py index cf277df..59ce30a 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -4048,7 +4048,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. elif opts.unexpand_link and p.islink() and p.isexpanded(): print 'Unexpanding to rev', p.linkinfo.lsrcmd5 p.update(rev, opts.server_side_source_service_files, opts.limit_size) - rev = p.linkinfo.lsrcmd5 + # XXX: calling update again is redundant (see below) + rev = p.rev
Are you sure that there p.rev really is different from p.srcmd5?
Maybe you should only use p.rev if p.rev.length < 32, just in case... M. -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On Wed, Mar 28, 2012 at 12:01:32PM +0200, Michael Schroeder wrote:
On Wed, Mar 28, 2012 at 11:52:59AM +0200, Michael Schroeder wrote:
Are you sure that there p.rev really is different from p.srcmd5?
Maybe you should only use p.rev if p.rev.length < 32, just in case...
Sorry, too much ruby, I mean len(p.rev) < 32 M. -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
Hi, On 2012-03-28 11:52:59 +0200, Michael Schroeder wrote:
On Tue, Mar 27, 2012 at 06:07:40PM +0200, OBS osc wrote:
From: Marcus Huewe
--- osc/commandline.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/osc/commandline.py b/osc/commandline.py index cf277df..59ce30a 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -4048,7 +4048,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. elif opts.unexpand_link and p.islink() and p.isexpanded(): print 'Unexpanding to rev', p.linkinfo.lsrcmd5 p.update(rev, opts.server_side_source_service_files, opts.limit_size) - rev = p.linkinfo.lsrcmd5 + # XXX: calling update again is redundant (see below) + rev = p.rev
Are you sure that there p.rev really is different from p.srcmd5?
Yes in case of an unexpanded link rev is the "plain revision number" (no expanding is done in this case). I just committed another fix for this code path (the old code for determining the rev (which is used for expanding/unexpanding) was completely wrong...). Marcus -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
participants (2)
-
Marcus Hüwe -
Michael Schroeder