openlp-core team mailing list archive

[Ken Roberts <alisonken1@xxxxxxxxx>]

oops - thought I removed those two lines.
I also remember running jenkins, but guess I forgot to delete the
previous run from the request.

On Wed, Jul 12, 2017 at 12:30 AM, Tomas Groth <second@xxxxxx> wrote:
> Review: Needs Fixing
>
> You left some commented code in, see the inline comment. Also please post the jenkins test result for the latest revision.
> Otherwise it looks good to me.
>
> Diff comments:
>
>>
>> === modified file 'openlp/core/lib/projector/pjlink1.py'
>> --- openlp/core/lib/projector/pjlink1.py      2017-06-17 00:25:06 +0000
>> +++ openlp/core/lib/projector/pjlink1.py      2017-07-07 23:49:26 +0000
>> @@ -331,7 +378,8 @@
>>                  self.change_status(E_SOCKET_TIMEOUT)
>>                  return
>>              read = self.readLine(self.max_size)
>> -            dontcare = self.readLine(self.max_size)  # Clean out the trailing \r\n
>> +            # _ = self.readLine(self.max_size)  # Clean out the trailing \r\n
>
> This should be removed.
>
>> +            self.readLine(self.max_size)  # Clean out the trailing \r\n
>>              if read is None:
>>                  log.warning('({ip}) read is None - socket error?'.format(ip=self.ip))
>>                  return
>> @@ -341,7 +389,8 @@
>>              data = decode(read, 'utf-8')
>>              # Possibility of extraneous data on input when reading.
>>              # Clean out extraneous characters in buffer.
>> -            dontcare = self.readLine(self.max_size)
>> +            # _ = self.readLine(self.max_size)
>
> Also this one.
>
>> +            self.readLine(self.max_size)
>>              log.debug('({ip}) check_login() read "{data}"'.format(ip=self.ip, data=data.strip()))
>>          # At this point, we should only have the initial login prompt with
>>          # possible authentication
>
>
> --
> https://code.launchpad.net/~alisonken1/openlp/pjlink2-f/+merge/327052
> You are the owner of lp:~alisonken1/openlp/pjlink2-f.



-- 
- Ken
Registered Linux user 296561
Slackin' since 1993
Slackware Linux (http://www.slackware.com)
OpenLP - Church Projection Software
Empower Your Church http://openlp.org

https://code.launchpad.net/~alisonken1/openlp/pjlink2-f/+merge/327052
Your team OpenLP Core is subscribed to branch lp:openlp.