r74635 - in /trunk/libconfig-model-openssh-perl: ./ debian/ lib/Config/Model/ lib/Config/Model/Backend/ lib/Config/Model/Backend/OpenSsh/ lib/Config/Model/user.d/ t/
ddumont-guest at users.alioth.debian.org
ddumont-guest at users.alioth.debian.org
Tue May 17 12:10:08 UTC 2011
Author: ddumont-guest
Date: Tue May 17 12:09:36 2011
New Revision: 74635
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74635
Log:
new upstream release
Added:
trunk/libconfig-model-openssh-perl/lib/Config/Model/user.d/
- copied from r74634, branches/upstream/libconfig-model-openssh-perl/current/lib/Config/Model/user.d/
Modified:
trunk/libconfig-model-openssh-perl/Build.PL
trunk/libconfig-model-openssh-perl/ChangeLog
trunk/libconfig-model-openssh-perl/MANIFEST
trunk/libconfig-model-openssh-perl/META.yml
trunk/libconfig-model-openssh-perl/debian/changelog
trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh.pm
trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh/Ssh.pm
trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh/Sshd.pm
trunk/libconfig-model-openssh-perl/lib/Config/Model/OpenSsh.pm
trunk/libconfig-model-openssh-perl/t/ssh_config.t
Modified: trunk/libconfig-model-openssh-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/Build.PL?rev=74635&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/Build.PL (original)
+++ trunk/libconfig-model-openssh-perl/Build.PL Tue May 17 12:09:36 2011
@@ -46,6 +46,7 @@
'build_requires' => {
'Module::Build' => '0.3601',
+ 'Test::Differences' => '0',
'Test::More' => '0'
},
'configure_requires' => {
Modified: trunk/libconfig-model-openssh-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/ChangeLog?rev=74635&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/ChangeLog (original)
+++ trunk/libconfig-model-openssh-perl/ChangeLog Tue May 17 12:09:36 2011
@@ -1,3 +1,10 @@
+2011-05-11 Dominique Dumont <domi.dumont at free.fr> v 1.217
+
+ * All Backend: test value with length instead of defined
+ (avoid keyword without value lines)
+ * added Test::Difference build dependency
+ * lib/Config/Model/user.d/ssh: added forgotten user file for ssh
+
2011-04-11 Dominique Dumont <domi.dumont at free.fr> v 1.216
* All: use Any::Moose instead of plain Moose
Modified: trunk/libconfig-model-openssh-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/MANIFEST?rev=74635&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/MANIFEST (original)
+++ trunk/libconfig-model-openssh-perl/MANIFEST Tue May 17 12:09:36 2011
@@ -29,6 +29,7 @@
lib/Config/Model/models/Sshd/MatchElement.pod
lib/Config/Model/system.d/ssh
lib/Config/Model/system.d/sshd
+lib/Config/Model/user.d/ssh
t/augeas_match.t
t/augeas_sshd.t
t/custom_sshd.t
Modified: trunk/libconfig-model-openssh-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/META.yml?rev=74635&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/META.yml (original)
+++ trunk/libconfig-model-openssh-perl/META.yml Tue May 17 12:09:36 2011
@@ -4,11 +4,12 @@
- 'Dominique Dumont'
build_requires:
Module::Build: 0.3601
+ Test::Differences: 0
Test::More: 0
configure_requires:
Module::Build: 0.3601
dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.200004, CPAN::Meta::Converter version 2.110930'
+generated_by: 'Dist::Zilla version 4.200006, CPAN::Meta::Converter version 2.110930'
license: lgpl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -22,4 +23,4 @@
Any::Moose: 0
Config::Model: 1.236
Log::Log4perl: 1.11
-version: 1.216
+version: 1.217
Modified: trunk/libconfig-model-openssh-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/debian/changelog?rev=74635&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/debian/changelog (original)
+++ trunk/libconfig-model-openssh-perl/debian/changelog Tue May 17 12:09:36 2011
@@ -1,3 +1,9 @@
+libconfig-model-openssh-perl (1.217-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Dominique Dumont <domi.dumont at free.fr> Tue, 17 May 2011 14:07:36 +0200
+
libconfig-model-openssh-perl (1.216-1) unstable; urgency=low
[ Jotam Jr. Trejo ]
Modified: trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh.pm?rev=74635&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh.pm (original)
+++ trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh.pm Tue May 17 12:09:36 2011
@@ -9,7 +9,7 @@
#
package Config::Model::Backend::OpenSsh ;
BEGIN {
- $Config::Model::Backend::OpenSsh::VERSION = '1.216';
+ $Config::Model::Backend::OpenSsh::VERSION = '1.217';
}
use Any::Moose ;
@@ -125,6 +125,7 @@
sub write_line {
my ($self, $k, $v, $note) = @_ ;
+ return '' unless length($v) ;
return $self->write_data_and_comments( undef, '#',sprintf("%-20s %s",$k,$v),$note) ;
}
@@ -157,11 +158,11 @@
if (defined $v and $elt->value_type eq 'boolean') {
$v = $v == 1 ? 'yes':'no' ;
}
- $result .= $self->write_line($name,$v,$note) if defined $v;
+ $result .= $self->write_line($name,$v,$note);
}
elsif ($type eq 'check_list') {
my $v = $elt->fetch($mode) ;
- $result .= $self->write_line($name,$v,$note) if defined $v and $v;
+ $result .= $self->write_line($name,$v,$note);
}
elsif ($type eq 'list') {
$result .= $self->write_data_and_comments(undef,'#', undef, $note) ;
Modified: trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh/Ssh.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh/Ssh.pm?rev=74635&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh/Ssh.pm (original)
+++ trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh/Ssh.pm Tue May 17 12:09:36 2011
@@ -9,7 +9,7 @@
#
package Config::Model::Backend::OpenSsh::Ssh ;
BEGIN {
- $Config::Model::Backend::OpenSsh::Ssh::VERSION = '1.216';
+ $Config::Model::Backend::OpenSsh::Ssh::VERSION = '1.217';
}
use Any::Moose ;
@@ -194,7 +194,7 @@
next if $name eq 'ipv6' ;
my $elt = $forward_elt->fetch_element($name) ;
my $v = $elt->fetch($mode) ;
- next unless defined $v;
+ next unless length($v);
$line .= $name =~ /bind|host$/ ? "$v$sep"
: $name eq 'port' ? "$v "
: $v ;
Modified: trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh/Sshd.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh/Sshd.pm?rev=74635&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh/Sshd.pm (original)
+++ trunk/libconfig-model-openssh-perl/lib/Config/Model/Backend/OpenSsh/Sshd.pm Tue May 17 12:09:36 2011
@@ -9,7 +9,7 @@
#
package Config::Model::Backend::OpenSsh::Sshd ;
BEGIN {
- $Config::Model::Backend::OpenSsh::Sshd::VERSION = '1.216';
+ $Config::Model::Backend::OpenSsh::Sshd::VERSION = '1.217';
}
use Any::Moose ;
Modified: trunk/libconfig-model-openssh-perl/lib/Config/Model/OpenSsh.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/lib/Config/Model/OpenSsh.pm?rev=74635&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/lib/Config/Model/OpenSsh.pm (original)
+++ trunk/libconfig-model-openssh-perl/lib/Config/Model/OpenSsh.pm Tue May 17 12:09:36 2011
@@ -9,7 +9,7 @@
#
package Config::Model::OpenSsh ;
BEGIN {
- $Config::Model::OpenSsh::VERSION = '1.216';
+ $Config::Model::OpenSsh::VERSION = '1.217';
}
1;
Modified: trunk/libconfig-model-openssh-perl/t/ssh_config.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/t/ssh_config.t?rev=74635&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/t/ssh_config.t (original)
+++ trunk/libconfig-model-openssh-perl/t/ssh_config.t Tue May 17 12:09:36 2011
@@ -7,6 +7,7 @@
use Log::Log4perl qw(:easy) ;
use File::Path ;
use English;
+use Test::Differences ;
use warnings;
@@ -132,6 +133,8 @@
ok($user_inst,"Read user .ssh/config and created instance") ;
+ my @joe_orig = read_user_ssh($wr_dir.$joe_home.'/.ssh/config') ;
+
my $user_cfg = $user_inst -> config_root ;
$dump = $user_cfg->dump_tree (mode => 'full' );
@@ -148,16 +151,15 @@
ok(-e $joe_file,"Found $joe_file") ;
# compare original and written file
- my @joe_orig = read_user_ssh($wr_dir.$joe_home.'/.ssh/config') ;
my @joe_written = read_user_ssh($joe_file) ;
- is_deeply(\@joe_written,\@joe_orig,"check user .ssh/config files") ;
+ eq_or_diff(\@joe_written,\@joe_orig,"check user .ssh/config files") ;
# write some data
$user_cfg->load('EnableSSHKeysign=1') ;
$user_inst->write_back() ;
unshift @joe_orig,'EnableSSHKeysign yes';
@joe_written = read_user_ssh($joe_file) ;
- is_deeply(\@joe_written,\@joe_orig,"check user .ssh/config files after modif") ;
+ eq_or_diff(\@joe_written,\@joe_orig,"check user .ssh/config files after modif") ;
}
__END__
More information about the Pkg-perl-cvs-commits
mailing list