[katello-devel] [PATCH] spelling and typos

Adrian Likins alikins at redhat.com
Thu Jan 26 17:25:54 UTC 2012


---
 src/app/models/activation_key.rb          |    4 ++--
 src/app/models/authorization.rb           |    2 +-
 src/app/models/glue/candlepin/consumer.rb |    2 +-
 src/app/models/glue/candlepin/owner.rb    |    2 +-
 src/app/models/glue/pulp/repo.rb          |    4 ++--
 src/app/models/glue/pulp/repos.rb         |   14 +++++++-------
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/app/models/activation_key.rb b/src/app/models/activation_key.rb
index 0d91914..1a58524 100644
--- a/src/app/models/activation_key.rb
+++ b/src/app/models/activation_key.rb
@@ -47,14 +47,14 @@ class ActivationKey < ActiveRecord::Base
     errors.add(:base, _("Cannot create activation keys in Library environment ")) if environment and  environment.library?
   end
 
-  # set's up system when registering with this activation key
+  # sets up system when registering with this activation key
   def apply_to_system(system)
     system.environment_id = self.environment_id if self.environment_id
     system.system_template_id = self.system_template_id if self.system_template_id
     system.system_activation_keys.build(:activation_key => self)
   end
 
-  # calculate entitlement consupmtion for given amount and pool quantity left, example use:
+  # calculate entitlement consumption for given amount and pool quantity left, example use:
   #   calculate_consumption(4, [10, 10]) -> [4, 0]
   #   calculate_consumption(4, [3, 2]) -> [3, 1]
   #   calculate_consumption(4, [1, 2, 1]) -> [1, 2, 1]
diff --git a/src/app/models/authorization.rb b/src/app/models/authorization.rb
index ea083b8..76c4774 100644
--- a/src/app/models/authorization.rb
+++ b/src/app/models/authorization.rb
@@ -37,7 +37,7 @@ module Authorization
 
   # performs permission checks - do not override this method and
   # create check_permissions(operation) instead and return true if permission
-  # is granted or call access_denied(operation) explicitely for an
+  # is granted or call access_denied(operation) explicitly for an
   # intermediate denial
   def enforce_permissions operation
     # we get called again with the operation being set to create
diff --git a/src/app/models/glue/candlepin/consumer.rb b/src/app/models/glue/candlepin/consumer.rb
index 5cc952d..e3e2be3 100644
--- a/src/app/models/glue/candlepin/consumer.rb
+++ b/src/app/models/glue/candlepin/consumer.rb
@@ -101,7 +101,7 @@ module Glue::Candlepin::Consumer
     end
 
     def del_candlepin_consumer
-      Rails.logger.info "Deleteing consumer in candlepin: #{name}"
+      Rails.logger.info "Deleting consumer in candlepin: #{name}"
       Candlepin::Consumer.destroy(self.uuid)
     rescue => e
       Rails.logger.error "Failed to delete candlepin consumer #{name}: #{e}, #{e.backtrace.join("\n")}"
diff --git a/src/app/models/glue/candlepin/owner.rb b/src/app/models/glue/candlepin/owner.rb
index 4c38e7d..4055593 100644
--- a/src/app/models/glue/candlepin/owner.rb
+++ b/src/app/models/glue/candlepin/owner.rb
@@ -41,7 +41,7 @@ module Glue::Candlepin::Owner
     end
 
     def del_owner
-      Rails.logger.info _("Deleteing owner in candlepin: #{name}")
+      Rails.logger.info _("Deleting owner in candlepin: #{name}")
       Candlepin::Owner.destroy(cp_key)
     rescue => e
       Rails.logger.error _("Failed to delete candlepin owner #{name}: #{e}, #{e.backtrace.join("\n")}")
diff --git a/src/app/models/glue/pulp/repo.rb b/src/app/models/glue/pulp/repo.rb
index 22ebbc3..5a2b2be 100644
--- a/src/app/models/glue/pulp/repo.rb
+++ b/src/app/models/glue/pulp/repo.rb
@@ -157,7 +157,7 @@ module Glue::Pulp::Repo
     queue.create(:name => "delete pulp repo : #{self.name}",       :priority => 2, :action => [self, :destroy_repo])
   end
 
-  # TODO: remove after pulp >= 0.0.401 get's released. There is this attribute
+  # TODO: remove after pulp >= 0.0.401 gets released. There is this attribute
   # directly in the repo API
   def uri
     if repo_base_path = AppConfig.pulp.url[/^(.*)api$/,1]
@@ -332,7 +332,7 @@ module Glue::Pulp::Repo
   end
 
   def cancel_sync
-    Rails.logger.info "Cancelling synchronization of repository #{self.pulp_id}"
+    Rails.logger.info "Canceling synchronization of repository #{self.pulp_id}"
     history = self.sync_status
     return if history.nil? || history.state == ::PulpSyncStatus::Status::NOT_SYNCED
 
diff --git a/src/app/models/glue/pulp/repos.rb b/src/app/models/glue/pulp/repos.rb
index 71b9fae..3fd44f8 100644
--- a/src/app/models/glue/pulp/repos.rb
+++ b/src/app/models/glue/pulp/repos.rb
@@ -15,6 +15,7 @@ require 'resources/pulp'
 require 'resources/cdn'
 require 'openssl'
 
+
 module Glue::Pulp::Repos
 
   def self.included(base)
@@ -68,7 +69,7 @@ module Glue::Pulp::Repos
     new_content.content
   end
 
-  # repo path for custom product repos (RH repo paths are derivated from
+  # repo path for custom product repos (RH repo paths are derived from
   # content url)
   def self.custom_repo_path(environment, product, name)
     prefix = [environment.organization.name,environment.name].map{|x| x.gsub(/[^-\w]/,"_") }.join("/")
@@ -78,7 +79,7 @@ module Glue::Pulp::Repos
   def self.custom_content_path(product, name)
     parts = []
     # We generate repo path only for custom product content. We add this
-    # constant string to avoid colisions with RH content. RH content url
+    # constant string to avoid collisions with RH content. RH content url
     # begins usually with something like "/content/dist/rhel/...".
     # There we prefix custom content/repo url with "/custom/..."
     parts << "custom"
@@ -125,7 +126,6 @@ module Glue::Pulp::Repos
       return self.repos(library).empty?
     end
 
-
     def repos env, include_disabled = false
       @repo_cache = {} if @repo_cache.nil?
       #cache repos so we can cache lazy_accessors
@@ -251,7 +251,7 @@ module Glue::Pulp::Repos
       end
     end
 
-    # Get the most relavant status for all the repos in this Product
+    # Get the most relevant status for all the repos in this Product
     def sync_status
       return @status if @status
 
@@ -317,7 +317,7 @@ module Glue::Pulp::Repos
     end
 
     def cancel_sync
-      Rails.logger.info "Cancelling synchronization of product #{name}"
+      Rails.logger.info "Canceling synchronization of product #{name}"
       for r in repos(library)
         r.cancel_sync
       end
@@ -447,8 +447,8 @@ module Glue::Pulp::Repos
     end
 
     def del_repos
-      #destroy all repos in all environmnents
-      Rails.logger.debug "deleting all repositoris in product #{name}"
+      #destroy all repos in all environments
+      Rails.logger.debug "deleting all repositories in product #{name}"
       self.environments.each do |env|
         self.repos(env).each do |repo|
           repo.destroy
-- 
1.7.1




More information about the katello-devel mailing list