[SCM] ci-tooling packaging branch, master, updated. a9cffd64a9170bd0579d7e6df6cd8f8e1209a913
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Wed Mar 4 14:25:56 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=a9cffd6
The following commit has been merged in the master branch:
commit a9cffd64a9170bd0579d7e6df6cd8f8e1209a913
Author: Rohan Garg <rohan at garg.io>
Date: Wed Mar 4 15:25:42 2015 +0100
Make sure we use the right method call
---
dci/source.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dci/source.rb b/dci/source.rb
index f495fda..c1bb1c5 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -42,7 +42,7 @@ if !options[:repos].nil? && options[:repos].count > 1
Dir.chdir(options[:workspace]) do
EXTRA_REPOS = 'extra_repos.json'
- if File.exists? EXTRA_REPOS
+ if File.exist? EXTRA_REPOS
extra_repos = JSON::parse(File.read(EXTRA_REPOS))
options[:repos].each do |repo|
# Default repos are ignored since they should already be in the chroot
@@ -63,7 +63,7 @@ dci_run_cmd('apt-get -y install devscripts lsb-release locales libdistro-info-pe
Dir.chdir(ARGV[1]) do
# Get source name and what not
PACKAGING_DIR = nil
- if File.exist('source/debian/source/format')
+ if File.exist?('source/debian/source/format')
if File.readlines('source/debian/source/format').contains? 'native'
PACKAGING_DIR = 'source/'
FORMAT = :native
@@ -109,7 +109,7 @@ Dir.chdir(ARGV[1]) do
# create orig tar
tar = "#{source_name}_#{tar_version}.orig.tar"
- File.delete(tar) if File.exists? tar
+ File.delete(tar) if File.exist? tar
fail 'Failed to create a tarball' unless system("tar -cf --exclude .git #{tar} source")
fail 'Failed to compress the tarball' unless system("xz -6 #{tar}")
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list