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

Merge pull request #1307 from DimStar77/travix

Browse Source 
Fix packaging after commit 3e5f3b137
This commit is contained in:
Max Lin 2017-12-19 20:34:30 +08:00 committed by GitHub
commit 55e468e553
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dist/ci/obs-build-target vendored
View File

@ -13,6 +13,7 @@ cd "$OBS_PACKAGE"
# point _service file to SOURCE_DIR instead of remote # point _service file to SOURCE_DIR instead of remote
sed -i "s|$(cd "$SOURCE_DIR" && git remote get-url origin)|$SOURCE_DIR|" _service sed -i "s|$(cd "$SOURCE_DIR" && git remote get-url origin)|$SOURCE_DIR|" _service
sed -i "s|<param name=\"scm\">git</param>|<param name=\"scm\">git</param><param name=\"revision\">$(cd "$SOURCE_DIR" && git describe --all)</param>|" _service
rm *.obscpio rm *.obscpio
osc service disabledrun osc service disabledrun

1
dist/package/openSUSE-release-tools.spec vendored
View File

@ -487,6 +487,7 @@ fi
%{_bindir}/osrt-pkglistgen-openSUSE:Leap:15.0-all %{_bindir}/osrt-pkglistgen-openSUSE:Leap:15.0-all
%{_bindir}/osrt-pkglistgen-openSUSE:Leap:15.0:Rings %{_bindir}/osrt-pkglistgen-openSUSE:Leap:15.0:Rings
%{_bindir}/osrt-pkglistgen-openSUSE:Leap:15.0:Staging %{_bindir}/osrt-pkglistgen-openSUSE:Leap:15.0:Staging
%{_bindir}/osrt-pkglistgen-openSUSE:Leap:15.0:Ports-aarch64.sh
%{_unitdir}/osrt-pkglistgen@.service %{_unitdir}/osrt-pkglistgen@.service
%{_unitdir}/osrt-pkglistgen@.timer %{_unitdir}/osrt-pkglistgen@.timer

4
pkglistgen.py
View File

@ -798,10 +798,10 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
del pool del pool
for reponame in sorted(set(drops.values())): for reponame in sorted(set(drops.values())):
print "<!-- %s -->" % reponame print("<!-- %s -->" % reponame)
for p in sorted(drops): for p in sorted(drops):
if drops[p] != reponame: continue if drops[p] != reponame: continue
print " <obsoletepackage>%s</obsoletepackage>" % p print(" <obsoletepackage>%s</obsoletepackage>" % p)
@cmdln.option('--overwrite', action='store_true', help='overwrite if output file exists') @cmdln.option('--overwrite', action='store_true', help='overwrite if output file exists')
def do_dump_solv(self, subcmd, opts, baseurl): def do_dump_solv(self, subcmd, opts, baseurl):