1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186 | diff --git a/do-all b/do-all
index 39ce3f7..f2d908f 100755
--- a/do-all
+++ b/do-all
@@ -84,19 +84,19 @@ n = len(dirs)
for directory in dirs:
i += 1
print("----------------------------------------------------------------------")
- print("do-all current directory: %s (%s of %s)" % (directory+'/'+subdirectory,i,n))
+ print("do-all current directory: %s (%s of %s)" % (os.path.join(directory, subdirectory),i,n))
print("----------------------------------------------------------------------")
sys.stdout.flush()
try:
- os.chdir(old_cwd + '/' + directory + '/' + subdirectory )
+ os.chdir(os.path.join(old_cwd, directory, subdirectory))
except:
- dirs_not_accessible.append(directory + '/' + subdirectory)
+ dirs_not_accessible.append(os.path.join(directory, subdirectory))
print("directory not accessible, failed to 'cd' into it")
continue
if directory in skip_list:
print("As requested by the configuration file,\n"
"the command wasn't executed in this directory")
- dirs_ignored.append(directory + '/' + subdirectory)
+ dirs_ignored.append(os.path.join(directory, subdirectory))
continue
try:
returncode = subprocess.call(command)
@@ -109,7 +109,7 @@ for directory in dirs:
#http://www.tldp.org/LDP/abs/html/exitcodes.html
returncode = 127
if returncode != 0:
- dirs_failed.append((directory+'/'+subdirectory,returncode))
+ dirs_failed.append((os.path.join(directory, subdirectory), returncode))
sys.stdout.flush()
#Print summary
diff --git a/get-kci-tarball b/get-kci-tarball
index 7675f20..fbf3271 100755
--- a/get-kci-tarball
+++ b/get-kci-tarball
@@ -58,7 +58,7 @@ kde_git_repository_url = "https://anongit.kde.org/%s" % upstream_name
#Create temporary directory to clone the repository.
temp_dir = tempfile.TemporaryDirectory()
-kde_clone_dir_name = temp_dir.name+"/"+upstream_name
+kde_clone_dir_name = os.path.join(temp_dir.name, upstream_name)
#Clone repository
returncode = subprocess.call(["git","clone",kde_git_repository_url,kde_clone_dir_name])
diff --git a/ka-update-metadata b/ka-update-metadata
index a99c489..dcb6cd1 100755
--- a/ka-update-metadata
+++ b/ka-update-metadata
@@ -77,7 +77,7 @@ for d in dirs:
d = d.split("-opensource-src")[0]
#Find out source package version
changelog = Changelog()
- changelog_file_name = d + '/' + subdir + '/debian/changelog'
+ changelog_file_name = os.path.join(d, subdir, 'debian/changelog')
try:
changelog.parse_changelog(codecs.open(changelog_file_name, 'r', 'utf-8'))
except FileNotFoundError:
@@ -114,7 +114,7 @@ for d in dirs:
# With the info parsed from $PWD/*/debian/control populate:
# - build_depends_set <- with all the binary packages appearing in Build-Depends[-Indep]
# - dev_package_version_map <- with all the binary packages with their versions
- control_file_name = d + '/' + subdir + '/debian/control'
+ control_file_name = os.path.join(d, subdir, 'debian/control')
try:
control_file = deb822.Packages.iter_paragraphs(open(control_file_name, 'r'));
except FileNotFoundError:
diff --git a/kubuntu-create-sru-branches b/kubuntu-create-sru-branches
index c4bfd13..a71288f 100755
--- a/kubuntu-create-sru-branches
+++ b/kubuntu-create-sru-branches
@@ -58,7 +58,7 @@ for package in packages:
print("Branching %s ..." % branch_url)
subprocess.check_call(["bzr", "branch", branch_url])
- os.chdir(workdir + "/" + package)
+ os.chdir(os.path.join(workdir, package))
with open("debian/control", "r") as f:
control = f.read()
diff --git a/staging-upload b/staging-upload
index 3e9eb43..57e2842 100755
--- a/staging-upload
+++ b/staging-upload
@@ -186,12 +186,12 @@ for package in packages:
continue
try:
- os.mkdir(basedir + "/" + package)
+ os.mkdir(os.path.join(basedir, package))
except OSError:
- print("removing existing " + basedir + "/" + package)
- shutil.rmtree(basedir + "/" + package)
- os.mkdir(basedir + "/" + package)
- os.chdir(basedir + "/" + package)
+ print("removing existing " os.path.join(basedir, package))
+ shutil.rmtree(os.path.join(basedir, package))
+ os.mkdir(os.path.join(basedir, package))
+ os.chdir(os.path.join(basedir, package))
if package in packagingExceptions:
upstreamVersion = packagingExceptions[package]
else:
@@ -215,7 +215,7 @@ for package in packages:
subprocess.check_call(["rsync", "--progress", "-z", "--copy-links", "--compress-level=9", "-e ssh", remote, "."])
except:
print("==== Skipping %s, failed to fetch tarball from depot.kde.org, moving to manual/" % (package))
- shutil.move(basedir + "/" + package, basedir + "/manual/" + package)
+ shutil.move(os.path.join(basedir, package), os.path.join(basedir, "manual", package))
moved.append((package, "failed to fetch tarball from depot"))
continue
orig = "%s_%s.orig.tar.xz" % (package, upstreamVersion)
@@ -237,7 +237,7 @@ for package in packages:
match = re.match(re.escape(package) + r'_([\d\.a-z]+)-', dscname)
if not match:
print("==== Skipping %s, version parsing failed, moving to manual/" % (package,))
- shutil.move(basedir + "/" + package, basedir + "/manual/" + package)
+ shutil.move(os.path.join(basedir, package), os.path.join(basedir, "manual", package))
moved.append((package, "version parsing failed"))
continue
@@ -297,7 +297,7 @@ for package in packages:
if not sanitizeBranch(package):
print "==== Skipping %s, git branch has unexpected content, moving to manual/" % (package,)
- shutil.move(basedir + "/" + package, basedir + "/manual/" + package)
+ shutil.move(os.path.join(basedir, package), os.path.join(basedir, "manual" , package))
moved.append((package, "git unclean or out of sync"))
continue
@@ -346,7 +346,7 @@ for package in packages:
# package build failed, manual intervention necessary
print "==== " + package + " build was interrupted, moving to manual/"
shutil.rmtree(basedir + "/manual/" + package, True)
- shutil.move(basedir + "/" + package, basedir + "/manual/" + package)
+ shutil.move(os.path.join(basedir, package), os.path.join(basedir, "manual", package))
moved.append((package, "build was interrupted"))
print("\n\n=== Packages are ready for upload in " + uploaddir)
diff --git a/ubuntu-archive-upload b/ubuntu-archive-upload
index c32f3f1..591acaa 100755
--- a/ubuntu-archive-upload
+++ b/ubuntu-archive-upload
@@ -126,7 +126,7 @@ for package in packages:
except IndexError:
print "=== %s not in the archive, new package?" % (package)
- packageDir = basedir + "/" + package
+ packageDir = os.path.join(basedir, package)
try:
os.mkdir(packageDir)
except OSError:
@@ -145,7 +145,7 @@ for package in packages:
if package == "kde4libs":
print "MMM gitName = kde4libs"
gitName = "kde4libs" # as an exception this one has git repo named after package
- subprocess.check_call(["git", "clone", debian_git + "/" + gitName, "git"])
+ subprocess.check_call(["git", "clone", os.path.join(debian_git, gitName), "git"])
os.chdir("git")
subprocess.check_call(["git", "checkout", "kubuntu_"+release+"_archive"])
else:
diff --git a/uploadsource b/uploadsource
index 69a8f83..6ca1df7 100755
--- a/uploadsource
+++ b/uploadsource
@@ -15,6 +15,7 @@ import subprocess
import sys
import argparse
import glob
+import os
from debian.changelog import Changelog, Version
@@ -62,7 +63,7 @@ if changelog.debian_revision != None:
version += "-" + changelog.debian_revision
#Find out the filename to upload
-file_pattern = ka_config['areas']['upload-area'] + "/" + src_pkg + "_" + version + "*_source.changes"
+file_pattern = os.path.join(ka_config['areas']['upload-area'], src_pkg + "_" + version + "*_source.changes")
files = glob.glob(file_pattern)
if not files:
|