Inserts ubuntu26.04 build
This commit is contained in:
3 files changed
+10
-12
No files matched your search
+5
-5
@@ -41,7 +41,7 @@ def error(message):
|
|||||||
|
|
||||||
|
|
||||||
def die(message):
|
def die(message):
|
||||||
print >> sys.stderr, "emerge fatal error: %s" % message
|
print("emerge fatal error: %s" % message, file=sys.stderr)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
@@ -63,12 +63,12 @@ def system(cmdstring, file=None):
|
|||||||
def getOS_Name():
|
def getOS_Name():
|
||||||
if os.path.exists("/etc/SuSE-release"):
|
if os.path.exists("/etc/SuSE-release"):
|
||||||
f = open("/etc/SuSE-release", "r")
|
f = open("/etc/SuSE-release", "r")
|
||||||
rx = re.compile("^VERSION = (.*)$")
|
rx = re.compile(r"^VERSION = (.*)$")
|
||||||
for line in f.readlines():
|
for line in f.readlines():
|
||||||
m = rx.match(line)
|
m = rx.match(line)
|
||||||
if not m:
|
if not m:
|
||||||
line = re.sub("\s", "", line)
|
line = re.sub(r"\s", "", line)
|
||||||
line = re.sub("\([xX]86[-_]64\)", "", line)
|
line = re.sub(r"\([xX]86[-_]64\)", "", line)
|
||||||
line = line.replace("SUSE", "")
|
line = line.replace("SUSE", "")
|
||||||
line = line.replace("LinuxEnterpriseServer", "SLE")
|
line = line.replace("LinuxEnterpriseServer", "SLE")
|
||||||
line = line.replace("LinuxEnterpriseDesktop", "SLE")
|
line = line.replace("LinuxEnterpriseDesktop", "SLE")
|
||||||
@@ -76,7 +76,7 @@ def getOS_Name():
|
|||||||
return "unknown"
|
return "unknown"
|
||||||
else:
|
else:
|
||||||
f = open("/etc/os-release", "r")
|
f = open("/etc/os-release", "r")
|
||||||
rx = re.compile('^PRETTY_NAME="(.*)"$')
|
rx = re.compile(r'^PRETTY_NAME="(.*)"$')
|
||||||
for line in f.readlines():
|
for line in f.readlines():
|
||||||
m = rx.match(line)
|
m = rx.match(line)
|
||||||
if m:
|
if m:
|
||||||
|
|||||||
+5
-7
@@ -8,7 +8,7 @@ import shutil
|
|||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
import ConfigParser
|
import configparser
|
||||||
import fnmatch
|
import fnmatch
|
||||||
|
|
||||||
|
|
||||||
@@ -169,7 +169,7 @@ class build(object):
|
|||||||
config_files.append(os.path.join(root, name))
|
config_files.append(os.path.join(root, name))
|
||||||
|
|
||||||
for config_file in config_files:
|
for config_file in config_files:
|
||||||
config = ConfigParser.RawConfigParser()
|
config = configparser.ConfigParser()
|
||||||
config.optionxform = str
|
config.optionxform = str
|
||||||
config.read(config_file)
|
config.read(config_file)
|
||||||
|
|
||||||
@@ -202,9 +202,7 @@ class build(object):
|
|||||||
|
|
||||||
|
|
||||||
def usage():
|
def usage():
|
||||||
print >> sys.stdout, "Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[
|
print("Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[0], file=sys.stderr)
|
||||||
0
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
@@ -226,7 +224,7 @@ def main():
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
except getopt.GetoptError as err:
|
except getopt.GetoptError as err:
|
||||||
print >> sys.stderr, err
|
print(err, file=sys.stderr)
|
||||||
usage()
|
usage()
|
||||||
sys.exit(2)
|
sys.exit(2)
|
||||||
|
|
||||||
@@ -279,7 +277,7 @@ def main():
|
|||||||
dstdir = os.path.join(
|
dstdir = os.path.join(
|
||||||
b.output_dir, "%s-%s-%s" % (b.project_name, b.repository, full_version)
|
b.output_dir, "%s-%s-%s" % (b.project_name, b.repository, full_version)
|
||||||
)
|
)
|
||||||
filter = re.compile("^.*%s\..*\.rpm$" % full_version)
|
filter = re.compile(r"^.*%s\..*\.rpm$" % full_version)
|
||||||
moved_files = moveFilesToDir(rpmbase_dir, dstdir, filter, True)
|
moved_files = moveFilesToDir(rpmbase_dir, dstdir, filter, True)
|
||||||
|
|
||||||
if rpm_filelist != None:
|
if rpm_filelist != None:
|
||||||
|
|||||||
Regular → Executable
File mode changed.
Reference in new issue
Block a user