[PATCH 0/1] Fix sstate error

[PATCH 0/1] Fix sstate error

[Zhai Edwin]

From: Zhai Edwin <edwin.zhai@intel.com>

RP,
Current sstate's fetch code doesn't reflect latest fetcher changes, so old
fetch style cause exception and fail silently. This patch fix it.

Another issue is "import xxx" in python function from sstate.bbclass can only
sit in the head of the function, else have UnboundLocalError: "local variable
XXX referenced before assignment".

We don't know if it is a known limitation of *.bbclass or some potential bug.
Can you give some comments?


Thanks,
edwin


Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: gzhai/fix2
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/fix2

Thanks,
    Zhai Edwin <edwin.zhai@intel.com>
---


Zhai Edwin (1):
  sstate: Fix bugs after new fetcher

 meta/classes/sstate.bbclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

[PATCH 1/1] sstate: Fix bugs after new fetcher

[Zhai Edwin]

From: Zhai Edwin <edwin.zhai@intel.com>

Current sstate's fetch code doesn't reflect latest fetcher changes, so old
fetch style cause exception and fail silently.

[BUGID #708] got fixed.

Another issue is "import xxx" in python function from sstate.bbclass can only
sit in the head of the function, else have UnboundLocalError: "local variable
XXX referenced before assignment".

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 meta/classes/sstate.bbclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index e4564e4..4f1bc39 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -326,13 +326,13 @@ def sstate_package(ss, d):
     return
 
 def pstaging_fetch(sstatepkg, d):
+    import bb.fetch2
 
     # Only try and fetch if the user has configured a mirror
     mirrors = bb.data.getVar('SSTATE_MIRRORS', d, True)
     if not mirrors:
         return
 
-    import bb.fetch2
     # Copy the data object and override DL_DIR and SRC_URI
     localdata = bb.data.createCopy(d)
     bb.data.update_data(localdata)
@@ -453,8 +453,8 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
             #bb.note(str(srcuri))
 
             try:
-                bb.fetch.init(srcuri.split(), localdata)
-                bb.fetch.checkstatus(localdata, srcuri.split())
+                fetcher = bb.fetch2.Fetch(srcuri.split(), localdata)
+                fetcher.checkstatus()
                 ret.append(task)
             except:
                 pass     
-- 
1.6.3.3

Re: [PATCH 0/1] Fix sstate error

[Richard Purdie]

On Fri, 2011-02-11 at 22:01 +0800, Zhai Edwin wrote:
> From: Zhai Edwin <edwin.zhai@intel.com>
> 
> RP,
> Current sstate's fetch code doesn't reflect latest fetcher changes, so old
> fetch style cause exception and fail silently. This patch fix it.

I've merged the fix to master, thanks.

> Another issue is "import xxx" in python function from sstate.bbclass can only
> sit in the head of the function, else have UnboundLocalError: "local variable
> XXX referenced before assignment".
>
> We don't know if it is a known limitation of *.bbclass or some potential bug.
> Can you give some comments?

Good question. The import should really always be at the top of the code
block in question so I think its a python constraint, not a .bbclass
one...

Cheers,

Richard

Re: [PATCH 0/1] Fix sstate error

[Zhai, Edwin]

Richard Purdie wrote:
>
> On Fri, 2011-02-11 at 22:01 +0800, Zhai Edwin wrote:
> > From: Zhai Edwin <edwin.zhai@intel.com>
> >
> > RP,
> > Current sstate's fetch code doesn't reflect latest fetcher changes, 
> so old
> > fetch style cause exception and fail silently. This patch fix it.
>
> I've merged the fix to master, thanks.
>
> > Another issue is "import xxx" in python function from sstate.bbclass 
> can only
> > sit in the head of the function, else have UnboundLocalError: "local 
> variable
> > XXX referenced before assignment".
> >
> > We don't know if it is a known limitation of *.bbclass or some 
> potential bug.
> > Can you give some comments?
>
> Good question. The import should really always be at the top of the code
> block in question so I think its a python constraint, not a .bbclass
> one...
>

Seems in-middle "import" is widely used in other *.py,
See bitbake/lib/bb/fetch/ssh.py,
    def go(self, url, urldata, d):
..........................
        import commands
        cmd = 'scp -B -r %s %s %s/' % (
            port,
            commands.mkarg(fr),
            commands.mkarg(ldir)
        )

I found only bb has such limitation:all the "import bb.xxx" are in the 
head of function, and adding stuff before it will cause same problem. 
Anything special for bb module?

> Cheers,
>
> Richard
>
>
>
>
>
>
>

Re: [PATCH 0/1] Fix sstate error

[Richard Purdie]

On Fri, 2011-02-11 at 22:42 +0800, Zhai, Edwin wrote:
> Richard Purdie wrote:
> > Good question. The import should really always be at the top of the code
> > block in question so I think its a python constraint, not a .bbclass
> > one...
> >
> 
> Seems in-middle "import" is widely used in other *.py,
> See bitbake/lib/bb/fetch/ssh.py,
>     def go(self, url, urldata, d):
> ..........................
>         import commands
>         cmd = 'scp -B -r %s %s %s/' % (
>             port,
>             commands.mkarg(fr),
>             commands.mkarg(ldir)
>         )
> 
> I found only bb has such limitation:all the "import bb.xxx" are in the 
> head of function, and adding stuff before it will cause same problem. 
> Anything special for bb module?

Is it just specific to the way we hacked the fetch vs fetch2 switch in?

Also, are you saying this problem only happens in parsed python in
the .bb and .bbclass files or that it happens in the bitbake code in
general?

Cheers,

Richard

Re: [PATCH 0/1] Fix sstate error

[Zhai, Edwin]

Richard Purdie wrote:
>
> On Fri, 2011-02-11 at 22:42 +0800, Zhai, Edwin wrote:
> > Richard Purdie wrote:
> > > Good question. The import should really always be at the top of 
> the code
> > > block in question so I think its a python constraint, not a .bbclass
> > > one...
> > >
> >
> > Seems in-middle "import" is widely used in other *.py,
> > See bitbake/lib/bb/fetch/ssh.py,
> >     def go(self, url, urldata, d):
> > ..........................
> >         import commands
> >         cmd = 'scp -B -r %s %s %s/' % (
> >             port,
> >             commands.mkarg(fr),
> >             commands.mkarg(ldir)
> >         )
> >
> > I found only bb has such limitation:all the "import bb.xxx" are in the
> > head of function, and adding stuff before it will cause same problem.
> > Anything special for bb module?
>
> Is it just specific to the way we hacked the fetch vs fetch2 switch in?
>
> Also, are you saying this problem only happens in parsed python in
> the .bb and .bbclass files or that it happens in the bitbake code in
> general?
>

Also in bitbake code like bitbake/lib/bb/utils.py.

> Cheers,
>
> Richard
>