Hi, Bruce: Thanks a lot.
Cheers, Li > -----Original Message----- > From: Bruce Ashfield [mailto:[email protected]] > Sent: Wednesday, July 29, 2015 11:19 PM > To: Li, Xin/李 欣 > Cc: [email protected] > Subject: Re: [meta-virtualization] [PATCH 1/4] pry: upgrade 0.9.12.6 -> 0.10.1 > > Thanks, > > I've merged all the recipe updates to master and fido-kilo. > > Cheers, > > Bruce > > On Tue, Jul 28, 2015 at 5:50 AM, Li xin <[email protected]> wrote: > > 1) Modify rdoc-fixup-opt.banner-heredoc.patch,since the contents has > > been changed. > > > > 2) Update the checksum of LICENSE,since the date in it has been > > changed, but the LICENSE has not been changed. > > > > Signed-off-by: Li Xin <[email protected]> > > --- > > .../ruby/pry/rdoc-fixup-opt.banner-heredoc.patch | 56 > > +++++++++++----------- > > meta-openstack/recipes-devtools/ruby/pry_git.bb | 8 ++-- > > 2 files changed, 33 insertions(+), 31 deletions(-) > > > > diff --git > > a/meta-openstack/recipes-devtools/ruby/pry/rdoc-fixup-opt.banner-hered > > oc.patch > > b/meta-openstack/recipes-devtools/ruby/pry/rdoc-fixup-opt.banner-hered > > oc.patch > > index b6612c9..32adfb6 100644 > > --- > > a/meta-openstack/recipes-devtools/ruby/pry/rdoc-fixup-opt.banner-hered > > oc.patch > > +++ b/meta-openstack/recipes-devtools/ruby/pry/rdoc-fixup-opt.banner-h > > +++ eredoc.patch > > @@ -1,6 +1,6 @@ > > -From 55f81df0bb27c68d2a817cade5e0eb472acf24e5 Mon Sep 17 00:00:00 > > 2001 > > -From: Mark Asselstine <[email protected]> > > -Date: Wed, 14 May 2014 10:43:04 -0400 > > +From 40f78c9ae1c8f37e382d2da3498e1670c1a321dd Mon Sep 17 00:00:00 > > +2001 > > +From: Li xin <[email protected]> > > +Date: Sat, 25 Jul 2015 03:13:50 +0900 > > Subject: [PATCH] rdoc: fixup opt.banner heredoc > > > > rdoc has some quirks with heredoc which in this case would @@ -13,39 > > +13,41 @@ Fixup the heredoc to use a more standard format which is > > known not to mess up rdoc processing. > > > > Signed-off-by: Mark Asselstine <[email protected]> > > +Signed-off-by: Li Xin <[email protected]> > > --- > > - lib/pry/commands/ls.rb | 34 +++++++++++++++++----------------- > > - 1 file changed, 17 insertions(+), 17 deletions(-) > > + lib/pry/commands/ls.rb | 35 ++++++++++++++++------------------- > > + 1 file changed, 16 insertions(+), 19 deletions(-) > > > > diff --git a/lib/pry/commands/ls.rb b/lib/pry/commands/ls.rb -index > > 6ce49bb..b78f7e1 100644 > > +index 9f0e68f..eda7a53 100644 > > --- a/lib/pry/commands/ls.rb > > +++ b/lib/pry/commands/ls.rb > > -@@ -6,23 +6,23 @@ class Pry > > +@@ -28,25 +28,22 @@ class Pry > > + description 'Show the list of vars and methods in the current scope.' > > command_options :shellwords => false, :interpolate => false > > > > - def options(opt) > > -- opt.banner unindent <<-'BANNER' > > -- Usage: ls [-m|-M|-p|-pM] [-q|-v] [-c|-i] [Object] > > -- ls [-g] [-l] > > +- banner <<-'BANNER' > > +- Usage: ls [-m|-M|-p|-pM] [-q|-v] [-c|-i] [Object] > > +- ls [-g] [-l] > > +- > > +- ls shows you which methods, constants and variables are accessible > > to > Pry. By > > +- default it shows you the local variables defined in the current > > shell, and > any > > +- public methods or instance variables defined on the current object. > > - > > -- ls shows you which methods, constants and variables are > > accessible to > Pry. By > > -- default it shows you the local variables defined in the current > > shell, > and any > > -- public methods or instance variables defined on the current > > object. > > +- The colours used are configurable using Pry.config.ls.*_color, and > > the > separator > > +- is Pry.config.ls.separator. > > - > > -- The colours used are configurable using Pry.config.ls.*_color, > > and the > separator > > -- is Pry.config.ls.separator. > > +- Pry.config.ls.ceiling is used to hide methods defined higher up in > > the > > +- inheritance chain, this is by default set to [Object, Module, > > Class] so that > > +- methods defined on all Objects are omitted. The -v flag can be used > > to > ignore > > +- this setting and show all methods, while the -q can be used to set > > the > ceiling > > +- much lower and show only methods defined on the object or its direct > class. > > - > > -- Pry.config.ls.ceiling is used to hide methods defined higher up > > in the > > -- inheritance chain, this is by default set to [Object, Module, > > Class] so > that > > -- methods defined on all Objects are omitted. The -v flag can be > > used to > ignore > > -- this setting and show all methods, while the -q can be used to > > set the > ceiling > > -- much lower and show only methods defined on the object or its > > direct > class. > > -- BANNER > > -+ opt.banner = <<-EOF > > +- Also check out `find-method` command (run `help find-method`). > > +- BANNER > > ++ opt.banner = <<-EOF > > +Usage: ls [-m|-M|-p|-pM] [-q|-v] [-c|-i] [Object] > > + ls [-g] [-l] > > -+ > > +ls shows you which methods, constants and variables are accessible > > to Pry. By +default it shows you the local variables defined in the > > current shell, and any +public methods or instance variables defined on the > current object. > > @@ -60,8 +62,8 @@ index 6ce49bb..b78f7e1 100644 +much lower and show > > only methods defined on the object or its direct class. > > + EOF > > > > - opt.on :m, :methods, "Show public methods defined on the Object > (default)" > > - opt.on :M, "instance-methods", "Show methods defined in a Module or > Class" > > + > > + def options(opt) > > -- > > -1.8.3.2 > > +1.8.4.2 > > > > diff --git a/meta-openstack/recipes-devtools/ruby/pry_git.bb > > b/meta-openstack/recipes-devtools/ruby/pry_git.bb > > index 37d4497..a4eb63c 100644 > > --- a/meta-openstack/recipes-devtools/ruby/pry_git.bb > > +++ b/meta-openstack/recipes-devtools/ruby/pry_git.bb > > @@ -7,18 +7,18 @@ for Ruby. It is written from scratch to provide a > > number of advanced \ features." > > > > LICENSE = "MIT" > > -LIC_FILES_CHKSUM = > "file://LICENSE;md5=7d1a6fbb73f604e1e716380490938bd4" > > +LIC_FILES_CHKSUM = > "file://LICENSE;md5=dde93753687e16ab0c4669232fd27fd0" > > > > PR = "r0" > > > > -BPV = "0.9.12.6" > > +BPV = "0.10.1" > > PV = "${BPV}" > > -SRCREV = "047788c4225b25bb0462e06715616964e4f0da15" > > +SRCREV = "191dc519813402acd6db0d7f73e652ed61f8111f" > > > > S = "${WORKDIR}/git" > > > > SRC_URI = " \ > > - git://github.com/pry/pry.git;branch=0-9-12-stable \ > > + git://github.com/pry/pry.git \ > > file://rdoc-fixup-opt.banner-heredoc.patch \ > > " > > > > -- > > 1.8.4.2 > > > > -- > > _______________________________________________ > > meta-virtualization mailing list > > [email protected] > > https://lists.yoctoproject.org/listinfo/meta-virtualization > > > > -- > "Thou shalt not follow the NULL pointer, for chaos and madness await thee at > its > end" -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
