From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Irina Patru <irina.patru@intel.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 1/3] distrodata.bbclass: Add fetch2 handlers to svn case in checkpkg
Date: Tue, 12 Nov 2013 10:21:38 +0000 [thread overview]
Message-ID: <1384251698.1143.1.camel@ted> (raw)
In-Reply-To: <1384173319-22148-1-git-send-email-irina.patru@intel.com>
Hi Irina,
You have a summary but this patch also needs a description of why we're
making this change and a Signed-off-by: line. The patch itself looks
good and is a nice cleanup.
Cheers,
Richard
On Mon, 2013-11-11 at 14:35 +0200, Irina Patru wrote:
> ---
> meta/classes/distrodata.bbclass | 43 ++++++++++++++++-----------------------
> 1 file changed, 17 insertions(+), 26 deletions(-)
>
> diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
> index 085575a..e481027 100644
> --- a/meta/classes/distrodata.bbclass
> +++ b/meta/classes/distrodata.bbclass
> @@ -751,34 +751,25 @@ python do_checkpkg() {
> if not tmp3:
> bb.plain("#DEBUG# Package %s: current version (%s) doesn't match the usual pattern" %(pname, pversion))
> elif type == 'svn':
> - options = []
> - if user:
> - options.append("--username %s" % user)
> - if pswd:
> - options.append("--password %s" % pswd)
> - svnproto = 'svn'
> - if 'proto' in parm:
> - svnproto = parm['proto']
> - if 'rev' in parm:
> - pcurver = parm['rev']
> -
> - svncmd = "svn info %s %s://%s%s/%s/ 2>&1" % (" ".join(options), svnproto, host, path, parm["module"])
> - print svncmd
> - svninfo = os.popen(svncmd).read()
> - if "Can't connect to host " in svninfo or "Connection timed out" in svninfo:
> - svncmd = "svn info %s %s://%s%s/%s/ 2>&1" % (" ".join(options), "http",
> - host, path, parm["module"])
> - svninfo = os.popen(svncmd).read()
> - for line in svninfo.split("\n"):
> - if re.search("^Last Changed Rev:", line):
> - pupver = line.split(" ")[-1]
> - if pupver in pversion:
> - pstatus = "MATCH"
> - else:
> - pstatus = "UPDATE"
> + ud = bb.fetch2.FetchData(uri, d)
>
> - if re.match("Err", pstatus):
> + svnFetcher = bb.fetch2.svn.Svn(d)
> + svnFetcher.urldata_init(ud, d)
> + try:
> + pupver = svnFetcher.latest_revision(uri, ud, d, ud.names[0])
> + except bb.fetch2.FetchError:
> + pstatus = "ErrSvnAccess"
> +
> + if pupver:
> + if pupver in pversion:
> + pstatus = "MATCH"
> + else:
> + pstatus = "UPDATE"
> + else:
> pstatus = "ErrSvnAccess"
> +
> + if 'rev' in ud.parm:
> + pcurver = ud.parm['rev']
>
> if pstatus != "ErrSvnAccess":
> tag = pversion.rsplit("+svn")[0]
prev parent reply other threads:[~2013-11-12 10:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-11 12:35 [PATCH 1/3] distrodata.bbclass: Add fetch2 handlers to svn case in checkpkg Irina Patru
2013-11-12 10:21 ` Richard Purdie [this message]
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=1384251698.1143.1.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=irina.patru@intel.com \
--cc=openembedded-core@lists.openembedded.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