diff mbox series

[07/12] prserv: fix read_only test

Message ID 20240329143956.1602707-8-michael.opdenacker@bootlin.com
State New
Headers show
Series prserv: add support for an "upstream" server | expand

Commit Message

Michael Opdenacker March 29, 2024, 2:39 p.m. UTC
From: Michael Opdenacker <michael.opdenacker@bootlin.com>

read_only is an attribute of the parent server object, not of the client.

Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Cc: Joshua Watt <JPEWhacker@gmail.com>
Cc: Tim Orling <ticotimo@gmail.com>
---
 lib/prserv/serv.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Richard Purdie April 3, 2024, 3:42 p.m. UTC | #1
On Fri, 2024-03-29 at 15:39 +0100, Michael Opdenacker via
lists.openembedded.org wrote:
> From: Michael Opdenacker <michael.opdenacker@bootlin.com>
> 
> read_only is an attribute of the parent server object, not of the
> client.
> 
> Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
> Cc: Joshua Watt <JPEWhacker@gmail.com>
> Cc: Tim Orling <ticotimo@gmail.com>
> ---
>  lib/prserv/serv.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/prserv/serv.py b/lib/prserv/serv.py
> index 242cd11a5a..efb2e0cf93 100644
> --- a/lib/prserv/serv.py
> +++ b/lib/prserv/serv.py
> @@ -61,7 +61,7 @@ class
> PRServerClient(bb.asyncrpc.AsyncServerConnection):
>  
>      async def handle_import_one(self, request):
>          response = None
> -        if not self.read_only:
> +        if not self.server.read_only:
>              version = request["version"]
>              pkgarch = request["pkgarch"]
>              checksum = request["checksum"]
> 

Isn't this a missing piece of "prserv: simplify the PRServerClient()
interface" and should be squashed there?

Cheers,

Richard
Michael Opdenacker April 3, 2024, 4:19 p.m. UTC | #2
Hi Richard,

On 4/3/24 at 17:42, Richard Purdie wrote:
> On Fri, 2024-03-29 at 15:39 +0100, Michael Opdenacker via
> lists.openembedded.org wrote:
>> From: Michael Opdenacker <michael.opdenacker@bootlin.com>
>>
>> read_only is an attribute of the parent server object, not of the
>> client.
>>
>> Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
>> Cc: Joshua Watt <JPEWhacker@gmail.com>
>> Cc: Tim Orling <ticotimo@gmail.com>
>> ---
>>   lib/prserv/serv.py | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/lib/prserv/serv.py b/lib/prserv/serv.py
>> index 242cd11a5a..efb2e0cf93 100644
>> --- a/lib/prserv/serv.py
>> +++ b/lib/prserv/serv.py
>> @@ -61,7 +61,7 @@ class
>> PRServerClient(bb.asyncrpc.AsyncServerConnection):
>>   
>>       async def handle_import_one(self, request):
>>           response = None
>> -        if not self.read_only:
>> +        if not self.server.read_only:
>>               version = request["version"]
>>               pkgarch = request["pkgarch"]
>>               checksum = request["checksum"]
>>
> Isn't this a missing piece of "prserv: simplify the PRServerClient()
> interface" and should be squashed there?

Oops, indeed, very good catch!
Fixed in my branch.
Many thanks!
Michael.
Richard Purdie April 3, 2024, 8:32 p.m. UTC | #3
On Wed, 2024-04-03 at 16:42 +0100, Richard Purdie via
lists.openembedded.org wrote:
> On Fri, 2024-03-29 at 15:39 +0100, Michael Opdenacker via
> lists.openembedded.org wrote:
> > From: Michael Opdenacker <michael.opdenacker@bootlin.com>
> > 
> > read_only is an attribute of the parent server object, not of the
> > client.
> > 
> > Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
> > Cc: Joshua Watt <JPEWhacker@gmail.com>
> > Cc: Tim Orling <ticotimo@gmail.com>
> > ---
> >  lib/prserv/serv.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/lib/prserv/serv.py b/lib/prserv/serv.py
> > index 242cd11a5a..efb2e0cf93 100644
> > --- a/lib/prserv/serv.py
> > +++ b/lib/prserv/serv.py
> > @@ -61,7 +61,7 @@ class
> > PRServerClient(bb.asyncrpc.AsyncServerConnection):
> >  
> >      async def handle_import_one(self, request):
> >          response = None
> > -        if not self.read_only:
> > +        if not self.server.read_only:
> >              version = request["version"]
> >              pkgarch = request["pkgarch"]
> >              checksum = request["checksum"]
> > 
> 
> Isn't this a missing piece of "prserv: simplify the PRServerClient()
> interface" and should be squashed there?

For testing purposes I squashed this in.

It also shows why I detest things like the quotes patch since that
cosmetic change broke trying to sort out this more important bisection
breaking issue.

Cheers,

Richard
diff mbox series

Patch

diff --git a/lib/prserv/serv.py b/lib/prserv/serv.py
index 242cd11a5a..efb2e0cf93 100644
--- a/lib/prserv/serv.py
+++ b/lib/prserv/serv.py
@@ -61,7 +61,7 @@  class PRServerClient(bb.asyncrpc.AsyncServerConnection):
 
     async def handle_import_one(self, request):
         response = None
-        if not self.read_only:
+        if not self.server.read_only:
             version = request["version"]
             pkgarch = request["pkgarch"]
             checksum = request["checksum"]