Hi, I'm attaching 2 patches for kubuntu-automation; one to fix the scripts to find out the package names and another one with the package names updated.
Fixes done in the scripts: * kf5-package-names - Don't print a duplicate extra-cmake-modules * plasma-package-names - Don't ask for baloo version, print error message if the number of arguments is wrong * kdeapplications-package-names - Don't ask for kdepim version
=== modified file 'kdeapplications-package-names'
--- kdeapplications-package-names 2015-06-09 16:14:46 +0000
+++ kdeapplications-package-names 2015-06-14 18:24:58 +0000
@@ -6,9 +6,8 @@
try:
version = sys.argv[1]
- pimversion = sys.argv[2]
except IndexError:
- print "Usage: kdeapplications-package-names [version] [pimversion]"
+ print "Usage: kdeapplications-package-names [version]"
sys.exit(1);
versionParts = version.split(".")
@@ -23,14 +22,7 @@
output, _ = p.communicate("ls *xz")
for line in output.splitlines():
- match = re.search(r'([a-zA-Z0-9\-]+)-' + re.escape(version) + r'\.tar\.', line)
- if match:
- name = match.group(1)
- if name == "ktux":
- pass
- else:
- print match.group(1)
- match = re.search(r'([a-zA-Z0-9\-]+)-' + re.escape(pimversion) + r'\.tar\.', line)
+ match = re.search(r'([a-zA-Z0-9\-]+)-.*\.tar\.', line)
if match:
name = match.group(1)
if name == "ktux":
=== modified file 'kf5-package-names'
--- kf5-package-names 2014-12-12 11:14:58 +0000
+++ kf5-package-names 2015-06-14 18:32:14 +0000
@@ -21,8 +21,6 @@
p = subprocess.Popen(["sftp", "-b", "-", "depot.kde.org:/home/ftpubuntu/%s/frameworks/%s/" % (stability, version)], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
output, _ = p.communicate("ls *xz")
-print "extra-cmake-modules"
-
for line in output.splitlines():
match = re.search(r'([a-zA-Z0-9\-]+)-' + re.escape(version) + '\.\d' + r'\.tar\.', line)
if match:
=== modified file 'plasma-package-names'
--- plasma-package-names 2015-04-18 12:15:57 +0000
+++ plasma-package-names 2015-06-14 18:32:35 +0000
@@ -4,8 +4,11 @@
import subprocess
import sys
-version = sys.argv[1]
-balooversion = sys.argv[2]
+try:
+ version = sys.argv[1]
+except IndexError:
+ print "Usage: plasma-package-names [version]"
+ sys.exit(1);
versionParts = version.split(".")
lastDigit = int(versionParts[-1])
@@ -19,7 +22,7 @@
output, _ = p.communicate("ls")
for line in output.splitlines():
- match = re.search(r'([a-zA-Z0-9\-]+)-' + re.escape(version) + r'\.tar\.', line)
+ match = re.search(r'([a-zA-Z0-9\-]+)-.*\.tar\.', line)
if match:
name = match.group(1)
if name == "baloo":
@@ -35,20 +38,5 @@
else:
print match.group(1)
- match = re.search(r'([a-zA-Z0-9\-]+)-' + re.escape(balooversion) + r'\.tar\.', line)
- if match:
- name = match.group(1)
- if name == "baloo":
- print "baloo-kf5"
- elif name == "breeze":
- print "breeze"
- print "breeze-qt4"
- elif name == "oxygen":
- print "oxygen"
- print "oxygen-qt4"
- elif name == "kfilemetadata":
- print "kfilemetadata-kf5"
- else:
- print match.group(1)
# kate: space-indent on; indent-width 4; replace-tabs on; indent-mode python; remove-trailing-space on;
=== modified file 'kf5-packages-wily.txt' --- kf5-packages-wily.txt 2015-06-04 19:27:43 +0000 +++ kf5-packages-wily.txt 2015-06-14 18:59:48 +0000 @@ -1,3 +1,8 @@ +kpeople +ktexteditor +kitemviews +kded +extra-cmake-modules kxmlrpcclient knotifications kunitconversion === modified file 'plasma-packages-wily.txt' --- plasma-packages-wily.txt 2015-06-04 19:27:43 +0000 +++ plasma-packages-wily.txt 2015-06-14 19:00:31 +0000 @@ -1,4 +1,6 @@ baloo-kf5 +bluedevil +bluez-qt breeze breeze-qt4 kde-cli-tools @@ -34,4 +36,3 @@ powerdevil sddm-kcm systemsettings -user-manager
signature.asc
Description: This is a digitally signed message part.
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
