diff options
author | Frazer Clews <frazer.clews@codethink.co.uk> | 2020-01-16 17:11:19 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-19 13:31:05 +0000 |
commit | fa5524890e86d353ee7d2194ccdd6c84e9bd2d31 (patch) | |
tree | f3d46ddbd5dd2b772a727b04303bb97b8ae43b9b /bitbake/lib/prserv/db.py | |
parent | 0ac5174c7d39a3e49893df0d517d47bec1935555 (diff) | |
download | poky-fa5524890e86d353ee7d2194ccdd6c84e9bd2d31.tar.gz |
bitbake: lib: amend code to use proper singleton comparisons where possible
amend the code to handle singleton comparisons properly so it only checks
if they only refer to the same object or not, and not bother
comparing the values.
(Bitbake rev: b809a6812aa15a8a9af97bc382cc4b19571e6bfc)
Signed-off-by: Frazer Clews <frazer.clews@codethink.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/prserv/db.py')
-rw-r--r-- | bitbake/lib/prserv/db.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/lib/prserv/db.py b/bitbake/lib/prserv/db.py index 117d8c052c..cb2a2461e0 100644 --- a/bitbake/lib/prserv/db.py +++ b/bitbake/lib/prserv/db.py | |||
@@ -71,7 +71,7 @@ class PRTable(object): | |||
71 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, | 71 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, |
72 | (version, pkgarch, checksum)) | 72 | (version, pkgarch, checksum)) |
73 | row=data.fetchone() | 73 | row=data.fetchone() |
74 | if row != None: | 74 | if row is not None: |
75 | return row[0] | 75 | return row[0] |
76 | else: | 76 | else: |
77 | #no value found, try to insert | 77 | #no value found, try to insert |
@@ -87,7 +87,7 @@ class PRTable(object): | |||
87 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, | 87 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, |
88 | (version, pkgarch, checksum)) | 88 | (version, pkgarch, checksum)) |
89 | row=data.fetchone() | 89 | row=data.fetchone() |
90 | if row != None: | 90 | if row is not None: |
91 | return row[0] | 91 | return row[0] |
92 | else: | 92 | else: |
93 | raise prserv.NotFoundError | 93 | raise prserv.NotFoundError |
@@ -99,7 +99,7 @@ class PRTable(object): | |||
99 | % (self.table, self.table), | 99 | % (self.table, self.table), |
100 | (version, pkgarch, checksum, version, pkgarch)) | 100 | (version, pkgarch, checksum, version, pkgarch)) |
101 | row=data.fetchone() | 101 | row=data.fetchone() |
102 | if row != None: | 102 | if row is not None: |
103 | return row[0] | 103 | return row[0] |
104 | else: | 104 | else: |
105 | #no value found, try to insert | 105 | #no value found, try to insert |
@@ -116,7 +116,7 @@ class PRTable(object): | |||
116 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, | 116 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, |
117 | (version, pkgarch, checksum)) | 117 | (version, pkgarch, checksum)) |
118 | row=data.fetchone() | 118 | row=data.fetchone() |
119 | if row != None: | 119 | if row is not None: |
120 | return row[0] | 120 | return row[0] |
121 | else: | 121 | else: |
122 | raise prserv.NotFoundError | 122 | raise prserv.NotFoundError |
@@ -132,7 +132,7 @@ class PRTable(object): | |||
132 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, | 132 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, |
133 | (version, pkgarch, checksum)) | 133 | (version, pkgarch, checksum)) |
134 | row = data.fetchone() | 134 | row = data.fetchone() |
135 | if row != None: | 135 | if row is not None: |
136 | val=row[0] | 136 | val=row[0] |
137 | else: | 137 | else: |
138 | #no value found, try to insert | 138 | #no value found, try to insert |
@@ -147,7 +147,7 @@ class PRTable(object): | |||
147 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, | 147 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, |
148 | (version, pkgarch, checksum)) | 148 | (version, pkgarch, checksum)) |
149 | row = data.fetchone() | 149 | row = data.fetchone() |
150 | if row != None: | 150 | if row is not None: |
151 | val = row[0] | 151 | val = row[0] |
152 | return val | 152 | return val |
153 | 153 | ||
@@ -170,7 +170,7 @@ class PRTable(object): | |||
170 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=? AND value>=?;" % self.table, | 170 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=? AND value>=?;" % self.table, |
171 | (version,pkgarch,checksum,value)) | 171 | (version,pkgarch,checksum,value)) |
172 | row=data.fetchone() | 172 | row=data.fetchone() |
173 | if row != None: | 173 | if row is not None: |
174 | return row[0] | 174 | return row[0] |
175 | else: | 175 | else: |
176 | return None | 176 | return None |