Author: mcalmer Date: Tue Sep 15 15:22:12 2009 New Revision: 58657 URL: http://svn.opensuse.org/viewcvs/yast?rev=58657&view=rev Log: fix repeated msgid (bnc#535805) Modified: trunk/ca-management/VERSION trunk/ca-management/package/yast2-ca-management.changes trunk/ca-management/src/YaPI/caUtils.pm Modified: trunk/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/VERSION?rev=58657&r1=58656&r2=58657&view=diff ============================================================================== --- trunk/ca-management/VERSION (original) +++ trunk/ca-management/VERSION Tue Sep 15 15:22:12 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-management.changes?rev=58657&r1=58656&r2=58657&view=diff ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Tue Sep 15 15:22:12 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 15 15:10:38 CEST 2009 - mc@suse.de + +- version 2.18.1 +- fix repeated msgid (bnc#535805) + +------------------------------------------------------------------- Fri Jun 19 12:40:01 CEST 2009 - mvidner@suse.cz - Using autodocs-ycp.ami, which contains a fix for automake 1.11. Modified: trunk/ca-management/src/YaPI/caUtils.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/YaPI/caUtils.pm?rev=58657&r1=58656&r2=58657&view=diff ============================================================================== --- trunk/ca-management/src/YaPI/caUtils.pm (original) +++ trunk/ca-management/src/YaPI/caUtils.pm Tue Sep 15 15:22:12 2009 @@ -1883,7 +1883,7 @@ if($key eq "emailAddress") { if (!defined $data->{$key} || $data->{$key} !~ /^[^@]+@[^@]+$/) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $data->{$key}, $key), code => "PARAM_CHECK_FAILED"); } @@ -2009,55 +2009,55 @@ if ($p =~ /^\s*email:(.+)\s*$/) { if (!defined $1 || $1 !~ /^[^@]+@[^@]+$/) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } elsif ($p =~ /^\s*URI:(.+)\s*$/) { if (!defined $1 || !URL->Check("$1")) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } elsif ($p =~ /^\s*DNS:(.+)\s*$/) { if (!defined $1 || !Hostname->CheckDomain("$1")) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } elsif ($p =~ /^\s*RID:(.+)\s*$/) { if (!defined $1 || $1 !~ /^(\d+\.)+\d+$/) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } elsif ($p =~ /^\s*IP:(.+)\s*$/) { if (!defined $1 || !(IP->Check4("$1") || IP->Check6("$1")) ) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } elsif ($p =~ /^\s*MS-UPN:(.+)\s*$/) { if (!defined $1 || $1 !~ /^[^@]+@[^@]+$/) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } elsif ($p =~ /^\s*K5PN:(.+)\s*$/) { if (!defined $1 || $1 !~ /^[^@]+@[^@]+$/) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } else { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } @@ -2079,7 +2079,7 @@ $data->{$key} =~ /^\s*(critical)?\s*,*\s*(.*)/ ; if (!URL->Check("$2")) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $2, $key), code => "PARAM_CHECK_FAILED"); } @@ -2109,7 +2109,7 @@ "msCodeInd", "msCodeCom", "msCTLSign", "msSGC", "msEFS", "nsSGC"))); return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } @@ -2133,47 +2133,47 @@ if ($location =~ /^\s*email:(.+)\s*$/) { if (!defined $1 || $1 !~ /^[^@]+@[^@]+$/) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } elsif ($location =~ /^\s*URI:(.+)\s*$/) { if (!defined $1 || !URL->Check("$1")) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } elsif ($location =~ /^\s*DNS:(.+)\s*$/) { if (!defined $1 || !Hostname->CheckDomain("$1")) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } elsif ($location =~ /^\s*RID:(.+)\s*$/) { if (!defined $1 || $1 !~ /^(\d+\.)+\d+$/) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } elsif ($location =~ /^\s*IP:(.+)\s*$/) { if (!defined $1 || !(IP->Check4("$1") || IP->Check6("$1")) ) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } else { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } } else { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $accessOID, $key), code => "PARAM_CHECK_FAILED"); } @@ -2194,13 +2194,13 @@ if ($p =~ /^\s*URI:(.+)\s*$/) { if (!defined $1 || !URL->Check("$1")) { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $1, $key), code => "PARAM_CHECK_FAILED"); } } else { return $self->SetError(summary => sprintf( - __("Invalid value'%s' for parameter '%s'."), + __("Invalid value '%s' for parameter '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org