mirror of
https://github.com/arsenetar/dupeguru.git
synced 2025-03-10 05:34:36 +00:00
Merge pull request #665 from KIAaze/fix_packaging_ubu20.04
Fix packaging on *ubuntu 20.04 (more specifically python version >=3.8)
This commit is contained in:
commit
7658cdafbc
@ -12,6 +12,7 @@ import shutil
|
|||||||
import json
|
import json
|
||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
import platform
|
import platform
|
||||||
|
import distro
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from hscommon.build import (
|
from hscommon.build import (
|
||||||
@ -90,7 +91,7 @@ def package_debian_distribution(distribution):
|
|||||||
)
|
)
|
||||||
shutil.copy(op.join("images", "dgse_logo_128.png"), srcpath)
|
shutil.copy(op.join("images", "dgse_logo_128.png"), srcpath)
|
||||||
os.chdir(destpath)
|
os.chdir(destpath)
|
||||||
cmd = "dpkg-buildpackage -S -us -uc"
|
cmd = "dpkg-buildpackage -F -us -uc"
|
||||||
os.system(cmd)
|
os.system(cmd)
|
||||||
os.chdir("../..")
|
os.chdir("../..")
|
||||||
|
|
||||||
@ -212,7 +213,7 @@ def main():
|
|||||||
package_windows()
|
package_windows()
|
||||||
else:
|
else:
|
||||||
if not args.arch_pkg:
|
if not args.arch_pkg:
|
||||||
distname, _, _ = platform.dist()
|
distname = distro.id()
|
||||||
else:
|
else:
|
||||||
distname = "arch"
|
distname = "arch"
|
||||||
if distname == "arch":
|
if distname == "arch":
|
||||||
|
@ -2,3 +2,4 @@ Send2Trash>=1.3.0
|
|||||||
sphinx>=1.2.2
|
sphinx>=1.2.2
|
||||||
polib>=1.0.4
|
polib>=1.0.4
|
||||||
hsaudiotag3k>=1.1.3
|
hsaudiotag3k>=1.1.3
|
||||||
|
distro>=1.5.0
|
Loading…
x
Reference in New Issue
Block a user