[SCM] ci-tooling packaging branch, master, updated. b51dd2603f9a367aa268ae8d0880ffc860454f50
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Wed Jul 15 17:43:46 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=b51dd26
The following commit has been merged in the master branch:
commit b51dd2603f9a367aa268ae8d0880ffc860454f50
Author: Rohan Garg <rohan at garg.io>
Date: Wed Jul 15 19:43:16 2015 +0200
Take the last stable release instead of the dev version
---
dci/mozilla.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 0fc8119..362958d 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -195,7 +195,8 @@ system("apt-get -y install #{packages.join(' ')}")
UBUNTU_RELEASES = `ubuntu-distro-info -a`.split
DEBIAN_RELEASES = `debian-distro-info -a`.split
-RELEASE = (DEBIAN_RELEASES.include? ARGV[2]) ? UBUNTU_RELEASES[-1] : ARGV[2]
+# Take the stable release, not the dev release from Ubuntu
+RELEASE = (DEBIAN_RELEASES.include? ARGV[2]) ? UBUNTU_RELEASES[-2] : ARGV[2]
release_info = package_releases
if release_info[:ubuntu] < release_info[:upstream]
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list