Inserts ubuntu26.04 build
This commit is contained in:
3 files changed
+10
-12
No files matched your search
+5
-7
@@ -8,7 +8,7 @@ import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
import ConfigParser
|
||||
import configparser
|
||||
import fnmatch
|
||||
|
||||
|
||||
@@ -169,7 +169,7 @@ class build(object):
|
||||
config_files.append(os.path.join(root, name))
|
||||
|
||||
for config_file in config_files:
|
||||
config = ConfigParser.RawConfigParser()
|
||||
config = configparser.ConfigParser()
|
||||
config.optionxform = str
|
||||
config.read(config_file)
|
||||
|
||||
@@ -202,9 +202,7 @@ class build(object):
|
||||
|
||||
|
||||
def usage():
|
||||
print >> sys.stdout, "Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[
|
||||
0
|
||||
]
|
||||
print("Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[0], file=sys.stderr)
|
||||
|
||||
|
||||
def main():
|
||||
@@ -226,7 +224,7 @@ def main():
|
||||
],
|
||||
)
|
||||
except getopt.GetoptError as err:
|
||||
print >> sys.stderr, err
|
||||
print(err, file=sys.stderr)
|
||||
usage()
|
||||
sys.exit(2)
|
||||
|
||||
@@ -279,7 +277,7 @@ def main():
|
||||
dstdir = os.path.join(
|
||||
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)
|
||||
|
||||
if rpm_filelist != None:
|
||||
|
||||
Reference in new issue
Block a user