aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem
diff options
context:
space:
mode:
Diffstat (limited to 'modules/buildsystem')
-rw-r--r--modules/buildsystem/manifests/mgarepo.pp2
-rw-r--r--modules/buildsystem/manifests/scheduler.pp2
-rw-r--r--modules/buildsystem/manifests/var/distros.pp2
-rw-r--r--modules/buildsystem/manifests/var/youri.pp6
-rwxr-xr-xmodules/buildsystem/templates/cleaner.rb2
5 files changed, 7 insertions, 7 deletions
diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp
index 2b314d3d..14e11e1a 100644
--- a/modules/buildsystem/manifests/mgarepo.pp
+++ b/modules/buildsystem/manifests/mgarepo.pp
@@ -27,7 +27,7 @@ class buildsystem::mgarepo {
require => File["${sched_home_dir}/repsys"],
}
- # FIXME: disabled temporarly as upload dir is a symlink to /var/lib/repsys/uploads
+ # FIXME: disabled temporarily as upload dir is a symlink to /var/lib/repsys/uploads
#file { "${sched_home_dir}/uploads":
# ensure => "directory",
# owner => $sched_login,
diff --git a/modules/buildsystem/manifests/scheduler.pp b/modules/buildsystem/manifests/scheduler.pp
index 7c186a19..53b248fc 100644
--- a/modules/buildsystem/manifests/scheduler.pp
+++ b/modules/buildsystem/manifests/scheduler.pp
@@ -1,5 +1,5 @@
class buildsystem::scheduler {
- # until ulri is splitted from main iurt rpm
+ # until ulri is split from main iurt rpm
include buildsystem::iurt::packages
include buildsystem::iurt::upload
include buildsystem::var::scheduler
diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp
index 0299c87c..9e45e2c2 100644
--- a/modules/buildsystem/manifests/var/distros.pp
+++ b/modules/buildsystem/manifests/var/distros.pp
@@ -5,7 +5,7 @@
# list of IP or domains allowed to access the repository. If you don't want to
# filter allowed IPs, don't those values.
# $distros:
-# a hash variable containing distributions informations indexed by
+# a hash variable containing distributions information indexed by
# distribution name. Each distribution is itself an hash containing
# the following infos:
# {
diff --git a/modules/buildsystem/manifests/var/youri.pp b/modules/buildsystem/manifests/var/youri.pp
index fa8a3a1d..f20b6c7b 100644
--- a/modules/buildsystem/manifests/var/youri.pp
+++ b/modules/buildsystem/manifests/var/youri.pp
@@ -1,7 +1,7 @@
-# The youri configuration files are created using informations from 3
+# The youri configuration files are created using information from 3
# different hash variables :
# - the $youri_conf_default variable defined in this class, containing
-# the default configuration for youri. It contais the repository
+# the default configuration for youri. It contains the repository
# configuration, and the definitions of the checks, actions and posts.
# - the $youri_conf parameter passed to this class. The values defined
# in this hash override the values defined in the default configuration.
@@ -17,7 +17,7 @@
#
# Parameters :
# $tmpl_youri_upload_conf:
-# template file for youri submi-upload.conf
+# template file for youri submit-upload.conf
# $tmpl_youri_todo_conf:
# template file for youri submit-todo.conf
# $packages_archivedir:
diff --git a/modules/buildsystem/templates/cleaner.rb b/modules/buildsystem/templates/cleaner.rb
index 78bd64c3..fa0d08ca 100755
--- a/modules/buildsystem/templates/cleaner.rb
+++ b/modules/buildsystem/templates/cleaner.rb
@@ -120,7 +120,7 @@ def take_upload_lock(path)
until has_lock
while File.exists?(path)
if Time.new - start_time > 2*3600.0
- puts "Could not aquire upload lock for more than 2h, giving up"
+ puts "Could not acquire upload lock for more than 2h, giving up"
end
sleep(5)
end