yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix problems with pkglistgen under python3

Browse Source
This commit is contained in:
Stephan Kulow 2019-05-12 21:22:07 +02:00
parent 4ef0c6230d
commit d0eef97d27
8 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gocd/pkglistgen.factory.gocd.yaml
View File

@ -20,27 +20,27 @@ pipelines:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s target
- script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s target
openSUSE_Factory_rings:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s rings
- script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s rings
openSUSE_Factory_ARM:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM
- script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM
openSUSE_Factory_PowerPC:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:PowerPC
- script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:PowerPC
openSUSE_Factory_zSystems:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:zSystems
- script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:zSystems
Update.Repos.Factory:
group: Factory.pkglistgen
lock_behavior: unlockWhenFinished
@ -61,14 +61,14 @@ pipelines:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory
- script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory
openSUSE_Factory_ARM:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory:ARM
- script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory:ARM
openSUSE_Factory_PowerPC:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory:PowerPC
- script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Factory:PowerPC

4
gocd/pkglistgen.factory.gocd.yaml.erb
View File

@ -28,7 +28,7 @@ pipelines:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %> <%= options %>
- script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %> <%= options %>
<% end -%>
Update.Repos.Factory:
group: Factory.pkglistgen
@ -51,5 +51,5 @@ pipelines:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen --apiurl https://api.opensuse.org handle_update_repos <%= project %>
- script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos <%= project %>
<% end -%>

14
gocd/pkglistgen.leap.gocd.yaml
View File

@ -20,22 +20,22 @@ pipelines:
resources:
- repo-checker
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1 -s target
- script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1 -s target
openSUSE_Leap_15.1_Ring:
resources:
- repo-checker
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1 -s rings
- script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1 -s rings
openSUSE_Leap_15.1_ARM:
resources:
- repo-checker
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1:ARM
- script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1:ARM
openSUSE_Leap_15.1_PowerPC:
resources:
- repo-checker
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1:PowerPC
- script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1:PowerPC
Update.Repos.Leap:
group: Leap.15.1.pkglistgen
lock_behavior: unlockWhenFinished
@ -54,10 +54,10 @@ pipelines:
jobs:
Leap:
tasks:
- script: python3 /usr/bin/osrt-pkglistgen --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1
- script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1
Leap_ARM:
tasks:
- script: python3 /usr/bin/osrt-pkglistgen --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1:ARM
- script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1:ARM
Leap_PowerPC:
tasks:
- script: python3 /usr/bin/osrt-pkglistgen --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1:PowerPC
- script: python3 ./pkglistgen.py --apiurl https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1:PowerPC

84
gocd/pkglistgen_staging.gocd.yaml
View File

@ -19,112 +19,112 @@ pipelines:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:A
--only-release-packages --force
"Staging.B":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:B
--only-release-packages --force
"Staging.C":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:C
--only-release-packages --force
"Staging.D":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:D
--only-release-packages --force
"Staging.E":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:E
--only-release-packages --force
"Staging.F":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:F
--only-release-packages --force
"Staging.G":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:G
--only-release-packages --force
"Staging.H":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:H
--only-release-packages --force
"Staging.I":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:I
--only-release-packages --force
"Staging.J":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:J
--only-release-packages --force
"Staging.K":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:K
--only-release-packages --force
"Staging.L":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:L
--only-release-packages --force
"Staging.M":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:M
--only-release-packages --force
"Staging.N":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:N
--only-release-packages --force
"Staging.O":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:O
--only-release-packages --force
"Staging.Gcc7":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:Gcc7
--only-release-packages --force
@ -179,7 +179,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -239,7 +239,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -299,7 +299,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -359,7 +359,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -419,7 +419,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -479,7 +479,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -539,7 +539,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -599,7 +599,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -659,7 +659,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -719,7 +719,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -779,7 +779,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -839,7 +839,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -899,7 +899,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -959,7 +959,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -1019,7 +1019,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -1079,7 +1079,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -1108,35 +1108,35 @@ pipelines:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Leap:15.1:Staging:A
--only-release-packages --force
"Staging.B":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Leap:15.1:Staging:B
--only-release-packages --force
"Staging.C":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Leap:15.1:Staging:C
--only-release-packages --force
"Staging.D":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Leap:15.1:Staging:D
--only-release-packages --force
"Staging.E":
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Leap:15.1:Staging:E
--only-release-packages --force
@ -1191,7 +1191,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./scripts/pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
"Leap.Staging.B":
environment_variables:
STAGING_PROJECT: openSUSE:Leap:15.1:Staging:B
@ -1243,7 +1243,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./scripts/pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
"Leap.Staging.C":
environment_variables:
STAGING_PROJECT: openSUSE:Leap:15.1:Staging:C
@ -1295,7 +1295,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./scripts/pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
"Leap.Staging.D":
environment_variables:
STAGING_PROJECT: openSUSE:Leap:15.1:Staging:D
@ -1347,7 +1347,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./scripts/pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
"Leap.Staging.E":
environment_variables:
STAGING_PROJECT: openSUSE:Leap:15.1:Staging:E
@ -1399,5 +1399,5 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./scripts/pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force

8
gocd/pkglistgen_staging.gocd.yaml.erb
View File

@ -21,7 +21,7 @@ pipelines:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Factory:Staging:<%= letter %>
--only-release-packages --force
<% end -%>
@ -77,7 +77,7 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@ -108,7 +108,7 @@ pipelines:
resources:
- repo-checker3
tasks:
- script: python3 /usr/bin/osrt-pkglistgen -A https://api.opensuse.org update_and_solve
- script: python3 ./pkglistgen.py -A https://api.opensuse.org update_and_solve
--staging openSUSE:Leap:15.1:Staging:<%= letter %>
--only-release-packages --force
<% end %>
@ -164,5 +164,5 @@ pipelines:
- repo-checker3
tasks:
- script: |-
python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
python3 ./scripts/pkglistgen.py --debug -A $STAGING_API update_and_solve --staging $STAGING_PROJECT --force
<% end %>

2
pkglistgen.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
from pkglistgen.cli import CommandLineInterface

4
pkglistgen/group.py
View File

@ -64,7 +64,7 @@ class Group(object):
if not isinstance(package, dict):
self._add_to_packages(package)
continue
name = package.keys()[0]
name = list(package)[0]
for rel in package[name]:
arch = None
if rel == 'locked':
@ -325,7 +325,7 @@ class Group(object):
if arch == '*':
missing = self.not_found
unresolvable = self.unresolvable.get(arch, dict())
for name in sorted(packages.keys() + missing.keys() + unresolvable.keys()):
for name in sorted(list(packages) + list(missing) + list(unresolvable)):
if name in self.silents:
continue
if name in missing:

8
pkglistgen/tool.py
View File

@ -125,7 +125,7 @@ class PkgListGen(ToolBase.ToolBase):
with open(os.path.join(self.output_dir, fn), 'w') as fh:
for arch in archs:
x = group.toxml(arch, self.ignore_broken, None)
x = ET.tostring(x, pretty_print=True)
x = ET.tostring(x, pretty_print=True, encoding='unicode')
fh.write(x)
def write_all_groups(self):
@ -144,7 +144,7 @@ class PkgListGen(ToolBase.ToolBase):
x = group.toxml(arch, self.ignore_broken, comment)
# only comment first time
comment = None
x = ET.tostring(x, pretty_print=True)
x = ET.tostring(x, pretty_print=True, encoding='unicode')
x = re.sub(r'\s*<!-- reason:', ' <!-- reason:', x)
fh.write(x)
return summary
@ -557,7 +557,7 @@ class PkgListGen(ToolBase.ToolBase):
else:
# No proper API function to perform the same operation.
print(subprocess.check_output(
' '.join(['cd', path, '&&', 'osc', 'addremove']), shell=True))
' '.join(['cd', path, '&&', 'osc', 'addremove']), shell=True, encoding='utf-8'))
package = Package(path)
package.commit(msg='Automatic update', skip_local_service_run=True)
@ -672,7 +672,7 @@ class PkgListGen(ToolBase.ToolBase):
for product_file in glob.glob(os.path.join(product_dir, '*.product')):
self.replace_product_version(product_file, product_version)
print(subprocess.check_output(
[PRODUCT_SERVICE, product_file, product_dir, project]))
[PRODUCT_SERVICE, product_file, product_dir, project], encoding='utf-8'))
for delete_kiwi in target_config.get('pkglistgen-delete-kiwis-{}'.format(scope), '').split(' '):
delete_kiwis = glob.glob(os.path.join(product_dir, delete_kiwi))