File 0001-fix-paranthesis-use.diff of Package tinyca2
From a4d57b429282b4adcab82666994a5dd75e8709dc Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Fri, 29 Nov 2013 15:32:02 +0100
Subject: [PATCH 1/3] fix paranthesis use
patch from debian
---
lib/GUI.pm | 14 +++++++-------
lib/GUI/X509_browser.pm | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/GUI.pm b/lib/GUI.pm
index 3ed2eec..67a5c2d 100644
--- a/lib/GUI.pm
+++ b/lib/GUI.pm
@@ -978,7 +978,7 @@ sub create_detail_tree {
$piter = $store->append($root);
$store->set($piter, 0 => $t);
- for my $l qw(CN EMAIL O OU C ST L) {
+ for my $l (qw(CN EMAIL O OU C ST L)) {
if(defined($parsed->{$l})) {
if($l eq "OU") {
foreach my $ou (@{$parsed->{'OU'}}) {
@@ -1003,7 +1003,7 @@ sub create_detail_tree {
$piter = $store->append($root);
$store->set($piter, 0 => $t);
- for my $l qw(CN EMAIL O OU C ST L) {
+ for my $l (qw(CN EMAIL O OU C ST L)) {
if(defined($parsed->{'ISSUERDN'}->{$l})) {
if($l eq "OU") {
foreach my $ou (@{$parsed->{'ISSUERDN'}->{'OU'}}) {
@@ -1029,7 +1029,7 @@ sub create_detail_tree {
$piter = $store->append($root);
$store->set($piter, 0 => $t);
- for my $l qw(STATUS NOTBEFORE NOTAFTER) {
+ for my $l (qw(STATUS NOTBEFORE NOTAFTER)) {
if(defined($parsed->{$l})) {
$citer = $store->append($piter);
$store->set($citer,
@@ -1045,7 +1045,7 @@ sub create_detail_tree {
$store->set($piter, 0 => $t);
- for my $l qw(STATUS SERIAL KEYSIZE PK_ALGORITHM SIG_ALGORITHM TYPE) {
+ for my $l (qw(STATUS SERIAL KEYSIZE PK_ALGORITHM SIG_ALGORITHM TYPE)) {
if(defined($parsed->{$l})) {
$citer = $store->append($piter);
$store->set($citer,
@@ -1060,7 +1060,7 @@ sub create_detail_tree {
$piter = $store->append($root);
$store->set($piter, 0 => $t);
- for my $l qw(FINGERPRINTMD5 FINGERPRINTSHA1) {
+ for my $l (qw(FINGERPRINTMD5 FINGERPRINTSHA1)) {
if(defined($parsed->{$l})) {
$citer = $store->append($piter);
$store->set($citer,
@@ -1249,7 +1249,7 @@ sub show_req_dialog {
# table for request data
my $cc=0;
my $ous = 1;
- if(defined($opts->{'OU'})) {
+ if(defined($opts->{'OU'}) and defined @{$opts->{'OU'}}) {
$ous = @{$opts->{'OU'}} - 1;
}
$reqtable = Gtk2::Table->new(1, 13 + $ous, 0);
@@ -1297,7 +1297,7 @@ sub show_req_dialog {
_("Organization Name (eg. company):"),
\$opts->{'O'}, $reqtable, 10, 1);
- if(defined($opts->{'OU'})) {
+ if(defined($opts->{'OU'}) and defined @{$opts->{'OU'}}) {
foreach my $ou (@{$opts->{'OU'}}) {
$entry = GUI::HELPERS::entry_to_table(
_("Organizational Unit Name (eg. section):"),
diff --git a/lib/GUI/X509_browser.pm b/lib/GUI/X509_browser.pm
index 4fb6cec..8cb1a71 100644
--- a/lib/GUI/X509_browser.pm
+++ b/lib/GUI/X509_browser.pm
@@ -624,7 +624,7 @@ sub selection_cadir {
$dir = $self->{'actdir'};
# cut off the last directory name to provide the ca-directory
- $dir =~ s/\/certs|\/req|\/keys$//;
+ $dir =~ s/(\/certs|\/req|\/keys)$//;
return($dir);
}
--
1.8.1.4