ref: refs/heads/master
commit fdb0bfb19681bc86bceb023a472193aa60e03888
Author: Klaus Kämpf
Date: Tue Jun 23 08:38:15 2009 +0200
Rephrase ruleinfo to explain instead of complain
---
bindings/ruby/tests/decisions.rb | 4 ++--
bindings/ruby/tests/ruleinfo.rb | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/bindings/ruby/tests/decisions.rb b/bindings/ruby/tests/decisions.rb
index 8ad2b83..4d73611 100644
--- a/bindings/ruby/tests/decisions.rb
+++ b/bindings/ruby/tests/decisions.rb
@@ -79,9 +79,9 @@ class DecisionTest < Test::Unit::TestCase
when Satsolver::DECISION_REMOVE
puts "#{i}: Remove #{d.solvable}\n\t#{d.ruleinfo.command_s}: #{d.ruleinfo}"
when Satsolver::DECISION_OBSOLETE
- puts "#{i}: Obsolete #{d.solvable}\n\t#{d.ruleinfo.command_s}: #{d.ruleinfo}"
+ puts "#{i}: Obsoleted #{d.solvable}\n\t#{d.ruleinfo.command_s}: #{d.ruleinfo}"
when Satsolver::DECISION_UPDATE
- puts "#{i}: Update #{d.solvable}\n\t#{d.ruleinfo.command_s}: #{d.ruleinfo}"
+ puts "#{i}: Update to #{d.solvable}\n\t#{d.ruleinfo.command_s}: #{d.ruleinfo}"
else
puts "#{i}: Decision op #{d.op}"
end
diff --git a/bindings/ruby/tests/ruleinfo.rb b/bindings/ruby/tests/ruleinfo.rb
index df15012..faa03ee 100644
--- a/bindings/ruby/tests/ruleinfo.rb
+++ b/bindings/ruby/tests/ruleinfo.rb
@@ -12,7 +12,7 @@ module Satsolver
when SOLVER_RULE_UPDATE:
"problem with installed package %s" % source
when SOLVER_RULE_JOB:
- "conflicting requests"
+ "job request"
when SOLVER_RULE_JOB_NOTHING_PROVIDES_DEP:
"nothing provides requested %s" % relation
when SOLVER_RULE_RPM:
@@ -22,7 +22,7 @@ module Satsolver
when SOLVER_RULE_RPM_NOTHING_PROVIDES_DEP:
"nothing provides %s needed by %s" % [ relation, source ]
when SOLVER_RULE_RPM_SAME_NAME:
- "cannot install both %s and %s" % [ source, target ]
+ "%s updates %s" % [ source, target ]
when SOLVER_RULE_RPM_PACKAGE_CONFLICT:
"package %s conflicts with %s provided by %s" % [ source, relation, target ]
when SOLVER_RULE_RPM_PACKAGE_OBSOLETES:
@@ -30,7 +30,7 @@ module Satsolver
when SOLVER_RULE_RPM_IMPLICIT_OBSOLETES:
"package %s implicitely obsoletes %s provided by %s" % [ source, relation, target ]
when SOLVER_RULE_RPM_PACKAGE_REQUIRES:
- "package %s requires %s, but none of the providers can be installed" % [ source, relation ]
+ "package %s requires %s" % [ source, relation ]
when SOLVER_RULE_RPM_SELF_CONFLICT:
"package %s conflicts with %s provided by itself" % [ source, relation ]
when SOLVER_RULE_UNKNOWN:
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
