mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00
Code Issues Projects Releases Wiki Activity

package_rpm: Fix some pycodestyle issues

Browse Source 
Fix following subset of observations reported by version 2.10.0 of
pycodestyle utility:

  meta/classes-global/package_rpm.bbclass:65:46: E231 missing whitespace after ','
  meta/classes-global/package_rpm.bbclass:66:46: E231 missing whitespace after ','
  meta/classes-global/package_rpm.bbclass:107:19: E231 missing whitespace after ','
  meta/classes-global/package_rpm.bbclass:109:69: E202 whitespace before ')'
  meta/classes-global/package_rpm.bbclass:122:103: W291 trailing whitespace
  meta/classes-global/package_rpm.bbclass:194:74: W291 trailing whitespace
  meta/classes-global/package_rpm.bbclass:448:16: E713 test for membership should be 'not in'
  meta/classes-global/package_rpm.bbclass:450:16: E713 test for membership should be 'not in'
  meta/classes-global/package_rpm.bbclass:520:1: W293 blank line contains whitespace
  meta/classes-global/package_rpm.bbclass:521:15: E231 missing whitespace after ','
  meta/classes-global/package_rpm.bbclass:542:12: E713 test for membership should be 'not in'
  meta/classes-global/package_rpm.bbclass:544:12: E713 test for membership should be 'not in'
  meta/classes-global/package_rpm.bbclass:647:67: W291 trailing whitespace

(From OE-Core rev: 7920599c05c066767025063b277df73c6560753d)

Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Niko Mauno
2023-10-21 15:51:11 +00:00
committed by Richard Purdie
parent 4962d27e5d
commit 91352a99f7
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes-global/package_rpm.bbclass
+13 -13
View File
@@ -62,8 +62,8 @@ def write_rpm_perfiledata(srcname, d):
for dep in depends_dict:
ver = depends_dict[dep]
if dep and ver:
ver = ver.replace("(","")
ver = ver.replace(")","")
ver = ver.replace("(", "")
ver = ver.replace(")", "")
outfile.write(dep + " " + ver + " ")
else:
outfile.write(dep + " ")
@@ -104,9 +104,9 @@ python write_specfile () {
import oe.packagedata
# append information for logs and patches to %prep
def add_prep(d,spec_files_bottom):
def add_prep(d, spec_files_bottom):
if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d):
spec_files_bottom.append('%%prep -n %s' % d.getVar('PN') )
spec_files_bottom.append('%%prep -n %s' % d.getVar('PN'))
spec_files_bottom.append('%s' % "echo \"include logs and patches, Please check them in SOURCES\"")
spec_files_bottom.append('')
@@ -119,7 +119,7 @@ python write_specfile () {
source_list = os.listdir(ar_outdir)
source_number = 0
for source in source_list:
# do_deploy_archives may have already run (from sstate) meaning a .src.rpm may already
# do_deploy_archives may have already run (from sstate) meaning a .src.rpm may already
# exist in ARCHIVER_OUTDIR so skip if present.
if source.endswith(".src.rpm"):
continue
@@ -191,7 +191,7 @@ python write_specfile () {
def walk_files(walkpath, target, conffiles, dirfiles):
# We can race against the ipk/deb backends which create CONTROL or DEBIAN directories
# when packaging. We just ignore these files which are created in
# when packaging. We just ignore these files which are created in
# packages-split/ and not package/
# We have the odd situation where the CONTROL/DEBIAN directory can be removed in the middle of
# of the walk, the isdir() test would then fail and the walk code would assume its a file
@@ -445,9 +445,9 @@ python write_specfile () {
rprovides = bb.utils.explode_dep_versions2(splitrprovides)
rreplaces = bb.utils.explode_dep_versions2(splitrreplaces)
for dep in rreplaces:
if not dep in robsoletes:
if dep not in robsoletes:
robsoletes[dep] = rreplaces[dep]
if not dep in rprovides:
if dep not in rprovides:
rprovides[dep] = rreplaces[dep]
splitrobsoletes = bb.utils.join_deps(robsoletes, commasep=False)
splitrprovides = bb.utils.join_deps(rprovides, commasep=False)
@@ -517,8 +517,8 @@ python write_specfile () {
spec_files_bottom.append('')
del localdata
add_prep(d,spec_files_bottom)
add_prep(d, spec_files_bottom)
spec_preamble_top.append('Summary: %s' % srcsummary)
spec_preamble_top.append('Name: %s' % srcname)
spec_preamble_top.append('Version: %s' % srcversion)
@@ -539,9 +539,9 @@ python write_specfile () {
rprovides = bb.utils.explode_dep_versions2(srcrprovides)
rreplaces = bb.utils.explode_dep_versions2(srcrreplaces)
for dep in rreplaces:
if not dep in robsoletes:
if dep not in robsoletes:
robsoletes[dep] = rreplaces[dep]
if not dep in rprovides:
if dep not in rprovides:
rprovides[dep] = rreplaces[dep]
srcrobsoletes = bb.utils.join_deps(robsoletes, commasep=False)
srcrprovides = bb.utils.join_deps(rprovides, commasep=False)
@@ -644,7 +644,7 @@ python do_package_rpm () {
return
# Construct the spec file...
# If the spec file already exist, and has not been stored into
# If the spec file already exist, and has not been stored into
# pseudo's files.db, it maybe cause rpmbuild src.rpm fail,
# so remove it before doing rpmbuild src.rpm.
srcname = d.getVar('PN')