r63136 - in /trunk/libconfig-model-perl: ./ debian/ lib/Config/ lib/Config/Model/ lib/Config/Model/Backend/ lib/Config/Model/Backend/Debian/ lib/Config/Model/Backend/Debian/Dpkg/ lib/Config/Model/models/Debian/ lib/Config/Model/models/Debian/Dep5/ lib/Config/Model/models/Debian/Dpkg/ t/
ddumont-guest at users.alioth.debian.org
ddumont-guest at users.alioth.debian.org
Fri Oct 1 11:10:01 UTC 2010
Author: ddumont-guest
Date: Fri Oct 1 11:08:26 2010
New Revision: 63136
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=63136
Log:
dch -r; ready for review
Added:
trunk/libconfig-model-perl/lib/Config/Model/Backend/Debian/Dpkg/
- copied from r63135, branches/upstream/libconfig-model-perl/current/lib/Config/Model/Backend/Debian/Dpkg/
trunk/libconfig-model-perl/lib/Config/Model/Backend/Debian/DpkgSyntax.pm
- copied unchanged from r63135, branches/upstream/libconfig-model-perl/current/lib/Config/Model/Backend/Debian/DpkgSyntax.pm
trunk/libconfig-model-perl/lib/Config/Model/models/Debian/Dpkg/
- copied from r63135, branches/upstream/libconfig-model-perl/current/lib/Config/Model/models/Debian/Dpkg/
trunk/libconfig-model-perl/t/debian-dpkg-control.t
- copied unchanged from r63135, branches/upstream/libconfig-model-perl/current/t/debian-dpkg-control.t
trunk/libconfig-model-perl/t/debian-dpkg-copyright.t
- copied unchanged from r63135, branches/upstream/libconfig-model-perl/current/t/debian-dpkg-copyright.t
Removed:
trunk/libconfig-model-perl/lib/Config/Model/Backend/Debian/Dep5.pm
trunk/libconfig-model-perl/lib/Config/Model/models/Debian/Dep5/
trunk/libconfig-model-perl/lib/Config/Model/models/Debian/Dep5.pl
trunk/libconfig-model-perl/t/dep5-config.t
Modified:
trunk/libconfig-model-perl/Build.PL
trunk/libconfig-model-perl/ChangeLog
trunk/libconfig-model-perl/MANIFEST
trunk/libconfig-model-perl/META.yml
trunk/libconfig-model-perl/debian/changelog
trunk/libconfig-model-perl/lib/Config/Model.pm
trunk/libconfig-model-perl/lib/Config/Model/Annotation.pm
trunk/libconfig-model-perl/lib/Config/Model/AnyId.pm
trunk/libconfig-model-perl/lib/Config/Model/AnyThing.pm
trunk/libconfig-model-perl/lib/Config/Model/AutoRead.pm
trunk/libconfig-model-perl/lib/Config/Model/Backend/Any.pm
trunk/libconfig-model-perl/lib/Config/Model/Backend/IniFile.pm
trunk/libconfig-model-perl/lib/Config/Model/Backend/ShellVar.pm
trunk/libconfig-model-perl/lib/Config/Model/Backend/Yaml.pm
trunk/libconfig-model-perl/lib/Config/Model/CheckList.pm
trunk/libconfig-model-perl/lib/Config/Model/Describe.pm
trunk/libconfig-model-perl/lib/Config/Model/DumpAsData.pm
trunk/libconfig-model-perl/lib/Config/Model/Dumper.pm
trunk/libconfig-model-perl/lib/Config/Model/Exception.pm
trunk/libconfig-model-perl/lib/Config/Model/HashId.pm
trunk/libconfig-model-perl/lib/Config/Model/IdElementReference.pm
trunk/libconfig-model-perl/lib/Config/Model/Instance.pm
trunk/libconfig-model-perl/lib/Config/Model/ListId.pm
trunk/libconfig-model-perl/lib/Config/Model/Loader.pm
trunk/libconfig-model-perl/lib/Config/Model/Node.pm
trunk/libconfig-model-perl/lib/Config/Model/ObjTreeScanner.pm
trunk/libconfig-model-perl/lib/Config/Model/Report.pm
trunk/libconfig-model-perl/lib/Config/Model/Searcher.pm
trunk/libconfig-model-perl/lib/Config/Model/SimpleUI.pm
trunk/libconfig-model-perl/lib/Config/Model/TermUI.pm
trunk/libconfig-model-perl/lib/Config/Model/Value.pm
trunk/libconfig-model-perl/lib/Config/Model/ValueComputer.pm
trunk/libconfig-model-perl/lib/Config/Model/WarpedNode.pm
trunk/libconfig-model-perl/lib/Config/Model/WarpedThing.pm
trunk/libconfig-model-perl/lib/Config/Model/WizardHelper.pm
trunk/libconfig-model-perl/t/warped_value.t
Modified: trunk/libconfig-model-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/Build.PL?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/Build.PL (original)
+++ trunk/libconfig-model-perl/Build.PL Fri Oct 1 11:08:26 2010
@@ -41,7 +41,8 @@
use Text::Template ;
my %models = ( popcon => [ 'PopCon', '/etc/popularity-contest.conf'],
- dep5 => [ 'Debian::Dep5', 'debian/copyright'],
+ 'dpkg-copyright' => [ 'Debian::Dpkg::Copyright', 'debian/copyright'],
+ 'dpkg-control' => [ 'Debian::Dpkg::Control' , 'debian/control'],
) ;
sub process_tmpl_files {
Modified: trunk/libconfig-model-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/ChangeLog?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/ChangeLog (original)
+++ trunk/libconfig-model-perl/ChangeLog Fri Oct 1 11:08:26 2010
@@ -1,3 +1,13 @@
+2010-09-30 Dominique Dumont <domi.dumont at free.fr> 1.210
+ * renamed config-edit-dep5 in config-edit-dpkg-copyright
+ * renamed Debian::Dep5 model to Debian::Dpkg::Copyright
+ * renamed Config::Model::Backend::Debian::Dep5 backend to
+ Config::Model::Backend::Debian::Dpkg::Copyright
+ * Factored out code to read/write control files in
+ Config::Model::Backend::Debian::DpkgSyntax
+ * Created model and backend for Debian control files
+ * added config-edit-dpkg-control command line
+
2010-09-20 Dominique Dumont <domi.dumont at free.fr> 1.209
* Fixed Debian::Dep5 parser: fixed read issue and added write
capability
Modified: trunk/libconfig-model-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/MANIFEST?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/MANIFEST (original)
+++ trunk/libconfig-model-perl/MANIFEST Fri Oct 1 11:08:26 2010
@@ -20,7 +20,9 @@
lib/Config/Model/AnyThing.pm
lib/Config/Model/AutoRead.pm
lib/Config/Model/Backend/Any.pm
-lib/Config/Model/Backend/Debian/Dep5.pm
+lib/Config/Model/Backend/Debian/Dpkg/Control.pm
+lib/Config/Model/Backend/Debian/Dpkg/Copyright.pm
+lib/Config/Model/Backend/Debian/DpkgSyntax.pm
lib/Config/Model/Backend/IniFile.pm
lib/Config/Model/Backend/ShellVar.pm
lib/Config/Model/Backend/Yaml.pm
@@ -45,9 +47,12 @@
lib/Config/Model/WarpedNode.pm
lib/Config/Model/WarpedThing.pm
lib/Config/Model/WizardHelper.pm
-lib/Config/Model/models/Debian/Dep5.pl
-lib/Config/Model/models/Debian/Dep5/Content.pl
-lib/Config/Model/models/Debian/Dep5/License.pl
+lib/Config/Model/models/Debian/Dpkg/Control.pl
+lib/Config/Model/models/Debian/Dpkg/Control/Binary.pl
+lib/Config/Model/models/Debian/Dpkg/Control/Source.pl
+lib/Config/Model/models/Debian/Dpkg/Copyright.pl
+lib/Config/Model/models/Debian/Dpkg/Copyright/Content.pl
+lib/Config/Model/models/Debian/Dpkg/Copyright/License.pl
lib/Config/Model/models/PopCon.pl
t/accept.t
t/annotation.t
@@ -56,7 +61,8 @@
t/auto_read.t
t/big_model.pm
t/check_list.t
-t/dep5-config.t
+t/debian-dpkg-control.t
+t/debian-dpkg-copyright.t
t/describe_node.t
t/dump_as_data.t
t/dump_load_model.pm
Modified: trunk/libconfig-model-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/META.yml?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/META.yml (original)
+++ trunk/libconfig-model-perl/META.yml Fri Oct 1 11:08:26 2010
@@ -32,4 +32,4 @@
bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=Config-Model
homepage: http://config-model.wiki.sourceforge.net
repository: http://config-model.hg.sourceforge.net:8000/hgroot/config-model/config-model
-version: 1.209
+version: 1.210
Modified: trunk/libconfig-model-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/debian/changelog?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/debian/changelog (original)
+++ trunk/libconfig-model-perl/debian/changelog Fri Oct 1 11:08:26 2010
@@ -1,3 +1,13 @@
+libconfig-model-perl (1.210-1) unstable; urgency=low
+
+ * New upstream release:
+ - Dep5 is renamed in Dpkg::Copyright
+ - command line is config-edit-dpkg-copyright
+ - new model for Dpkg control file (with config-edit-dpkg-control
+ command)
+
+ -- Dominique Dumont <dominique.dumont at hp.com> Fri, 01 Oct 2010 13:02:21 +0200
+
libconfig-model-perl (1.209-1) unstable; urgency=low
* New upstream release (Fixed Debian::Dep5 read/write backend)
Modified: trunk/libconfig-model-perl/lib/Config/Model.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model.pm Fri Oct 1 11:08:26 2010
@@ -9,7 +9,7 @@
#
package Config::Model;
BEGIN {
- $Config::Model::VERSION = '1.209';
+ $Config::Model::VERSION = '1.210';
}
require Exporter;
use Carp;
@@ -42,7 +42,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Annotation.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Annotation.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Annotation.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Annotation.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::Annotation;
BEGIN {
- $Config::Model::Annotation::VERSION = '1.209';
+ $Config::Model::Annotation::VERSION = '1.210';
}
use Moose ;
@@ -57,7 +57,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/AnyId.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/AnyId.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/AnyId.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/AnyId.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::AnyId ;
BEGIN {
- $Config::Model::AnyId::VERSION = '1.209';
+ $Config::Model::AnyId::VERSION = '1.210';
}
use Config::Model::Exception ;
use Scalar::Util qw(weaken) ;
@@ -54,7 +54,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/AnyThing.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/AnyThing.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/AnyThing.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/AnyThing.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::AnyThing;
BEGIN {
- $Config::Model::AnyThing::VERSION = '1.209';
+ $Config::Model::AnyThing::VERSION = '1.210';
}
use Scalar::Util qw(weaken);
use Carp;
@@ -39,7 +39,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/AutoRead.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/AutoRead.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/AutoRead.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/AutoRead.pm Fri Oct 1 11:08:26 2010
@@ -28,7 +28,7 @@
package Config::Model::AutoRead ;
BEGIN {
- $Config::Model::AutoRead::VERSION = '1.209';
+ $Config::Model::AutoRead::VERSION = '1.210';
}
use Carp;
use strict;
@@ -125,37 +125,44 @@
#
sub load_backend_class {
my $backend = shift;
- my $f = shift ;
-
- my $c = my $file = "Config::Model::Backend::".ucfirst($backend) ;
- $file =~ s!::!/!g;
-
- return $c if $c->can($f) ; # no need to load class get_logger("Data")->debug("load_backend_class: loading class $c, $file.pm");
- eval {require $file.'.pm'; } ;
-
- return $c unless $@ ;
-
+ my $function = shift ;
+
+ my %c ;
+
+ my $k = "Config::Model::Backend::".ucfirst($backend) ;
+ my $f = $k.'.pm';
+ $f =~ s!::!/!g;
+ $c{$k} = $f ;
+
# try another class
- my $err = $@ ;
- my $file2 = $file ;
- my $c2 = $c;
- $c2 =~ s/_(\w)/uc($1)/ge;
- $file2 =~ s/_(\w)/uc($1)/ge;
-
- return $c2 if $c2->can($f) ; # no need to load class
-
- return if $c eq $c2 ; # no need to try to load the same class
-
- get_logger("Data")->debug("load_backend_class: loading class $c2, $file2.pm");
- eval {require $file2.'.pm' ; } ;
-
+ $k =~ s/_(\w)/uc($1)/ge;
+ $f =~ s/_(\w)/uc($1)/ge;
+ $c{$k} = $f ;
+
+ foreach my $c (keys %c) {
+ return $c if $c->can($function) ; # no need to load class
+ }
+
+
+ # look for file to load
+ my $class_to_load ;
+ foreach my $c (keys %c) {
+ foreach my $prefix (@INC) {
+ my $realfilename = "$prefix/$c{$c}";
+ $class_to_load = $c if -f $realfilename ;
+ }
+ }
+
+ return unless defined $class_to_load ;
+ my $file_to_load = $c{$class_to_load} ;
+
+ get_logger("Data")->debug("load_backend_class: loading class $class_to_load, $file_to_load");
+ eval {require $file_to_load; } ;
+
if ($@) {
- warn "auto_read: unknown backend '$backend'".
- ", cannot load Perl class $c: $err$@\n";
- return ;
- }
-
- return $c2;
+ die "Could not parse $file_to_load: $@\n";
+ }
+ return $class_to_load ;
}
sub auto_read_init {
@@ -499,7 +506,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Backend/Any.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Backend/Any.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Backend/Any.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Backend/Any.pm Fri Oct 1 11:08:26 2010
@@ -28,7 +28,7 @@
package Config::Model::Backend::Any ;
BEGIN {
- $Config::Model::Backend::Any::VERSION = '1.209';
+ $Config::Model::Backend::Any::VERSION = '1.210';
}
use Carp;
@@ -79,7 +79,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Backend/IniFile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Backend/IniFile.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Backend/IniFile.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Backend/IniFile.pm Fri Oct 1 11:08:26 2010
@@ -31,7 +31,7 @@
package Config::Model::Backend::IniFile ;
BEGIN {
- $Config::Model::Backend::IniFile::VERSION = '1.209';
+ $Config::Model::Backend::IniFile::VERSION = '1.210';
}
use Carp;
@@ -219,7 +219,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Backend/ShellVar.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Backend/ShellVar.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Backend/ShellVar.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Backend/ShellVar.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::Backend::ShellVar ;
BEGIN {
- $Config::Model::Backend::ShellVar::VERSION = '1.209';
+ $Config::Model::Backend::ShellVar::VERSION = '1.210';
}
use Carp;
@@ -161,7 +161,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Backend/Yaml.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Backend/Yaml.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Backend/Yaml.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Backend/Yaml.pm Fri Oct 1 11:08:26 2010
@@ -10,7 +10,7 @@
package Config::Model::Backend::Yaml ;
BEGIN {
- $Config::Model::Backend::Yaml::VERSION = '1.209';
+ $Config::Model::Backend::Yaml::VERSION = '1.210';
}
use Carp;
@@ -88,7 +88,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/CheckList.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/CheckList.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/CheckList.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/CheckList.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::CheckList ;
BEGIN {
- $Config::Model::CheckList::VERSION = '1.209';
+ $Config::Model::CheckList::VERSION = '1.210';
}
use Config::Model::Exception ;
use Config::Model::IdElementReference ;
@@ -47,7 +47,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Describe.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Describe.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Describe.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Describe.pm Fri Oct 1 11:08:26 2010
@@ -28,7 +28,7 @@
package Config::Model::Describe;
BEGIN {
- $Config::Model::Describe::VERSION = '1.209';
+ $Config::Model::Describe::VERSION = '1.210';
}
use Carp;
use strict;
@@ -44,7 +44,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/DumpAsData.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/DumpAsData.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/DumpAsData.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/DumpAsData.pm Fri Oct 1 11:08:26 2010
@@ -28,7 +28,7 @@
package Config::Model::DumpAsData;
BEGIN {
- $Config::Model::DumpAsData::VERSION = '1.209';
+ $Config::Model::DumpAsData::VERSION = '1.210';
}
use Carp;
use strict;
@@ -43,7 +43,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Dumper.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Dumper.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Dumper.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Dumper.pm Fri Oct 1 11:08:26 2010
@@ -28,7 +28,7 @@
package Config::Model::Dumper;
BEGIN {
- $Config::Model::Dumper::VERSION = '1.209';
+ $Config::Model::Dumper::VERSION = '1.210';
}
use Carp;
use strict;
@@ -43,7 +43,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Exception.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Exception.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Exception.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Exception.pm Fri Oct 1 11:08:26 2010
@@ -28,7 +28,7 @@
package Config::Model::Exception ;
BEGIN {
- $Config::Model::Exception::VERSION = '1.209';
+ $Config::Model::Exception::VERSION = '1.210';
}
use warnings ;
use strict;
@@ -144,7 +144,7 @@
package Config::Model::Exception::Any ;
BEGIN {
- $Config::Model::Exception::Any::VERSION = '1.209';
+ $Config::Model::Exception::Any::VERSION = '1.210';
}
sub full_message {
@@ -175,7 +175,7 @@
package Config::Model::Exception::LoadData ;
BEGIN {
- $Config::Model::Exception::LoadData::VERSION = '1.209';
+ $Config::Model::Exception::LoadData::VERSION = '1.210';
}
sub full_message {
@@ -195,7 +195,7 @@
package Config::Model::Exception::Model ;
BEGIN {
- $Config::Model::Exception::Model::VERSION = '1.209';
+ $Config::Model::Exception::Model::VERSION = '1.210';
}
sub full_message {
@@ -221,7 +221,7 @@
package Config::Model::Exception::Load ;
BEGIN {
- $Config::Model::Exception::Load::VERSION = '1.209';
+ $Config::Model::Exception::Load::VERSION = '1.210';
}
sub full_message {
@@ -239,7 +239,7 @@
package Config::Model::Exception::RestrictedElement ;
BEGIN {
- $Config::Model::Exception::RestrictedElement::VERSION = '1.209';
+ $Config::Model::Exception::RestrictedElement::VERSION = '1.210';
}
sub full_message {
@@ -259,7 +259,7 @@
package Config::Model::Exception::UnavailableElement ;
BEGIN {
- $Config::Model::Exception::UnavailableElement::VERSION = '1.209';
+ $Config::Model::Exception::UnavailableElement::VERSION = '1.210';
}
sub full_message {
@@ -281,7 +281,7 @@
package Config::Model::Exception::ObsoleteElement ;
BEGIN {
- $Config::Model::Exception::ObsoleteElement::VERSION = '1.209';
+ $Config::Model::Exception::ObsoleteElement::VERSION = '1.210';
}
sub full_message {
@@ -303,7 +303,7 @@
package Config::Model::Exception::UnknownElement ;
BEGIN {
- $Config::Model::Exception::UnknownElement::VERSION = '1.209';
+ $Config::Model::Exception::UnknownElement::VERSION = '1.210';
}
use Carp;
@@ -361,7 +361,7 @@
package Config::Model::Exception::UnknownId ;
BEGIN {
- $Config::Model::Exception::UnknownId::VERSION = '1.209';
+ $Config::Model::Exception::UnknownId::VERSION = '1.210';
}
sub full_message {
@@ -390,7 +390,7 @@
package Config::Model::Exception::WrongType ;
BEGIN {
- $Config::Model::Exception::WrongType::VERSION = '1.209';
+ $Config::Model::Exception::WrongType::VERSION = '1.210';
}
sub full_message {
@@ -414,7 +414,7 @@
package Config::Model::Exception::Xml ;
BEGIN {
- $Config::Model::Exception::Xml::VERSION = '1.209';
+ $Config::Model::Exception::Xml::VERSION = '1.210';
}
sub full_message {
@@ -442,7 +442,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/HashId.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/HashId.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/HashId.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/HashId.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::HashId ;
BEGIN {
- $Config::Model::HashId::VERSION = '1.209';
+ $Config::Model::HashId::VERSION = '1.210';
}
use Config::Model::Exception ;
use Scalar::Util qw(weaken) ;
@@ -47,7 +47,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/IdElementReference.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/IdElementReference.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/IdElementReference.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/IdElementReference.pm Fri Oct 1 11:08:26 2010
@@ -28,7 +28,7 @@
package Config::Model::IdElementReference ;
BEGIN {
- $Config::Model::IdElementReference::VERSION = '1.209';
+ $Config::Model::IdElementReference::VERSION = '1.210';
}
use warnings ;
@@ -46,7 +46,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Instance.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Instance.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Instance.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Instance.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::Instance;
BEGIN {
- $Config::Model::Instance::VERSION = '1.209';
+ $Config::Model::Instance::VERSION = '1.210';
}
use Scalar::Util qw(weaken) ;
use File::Path;
@@ -56,7 +56,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/ListId.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/ListId.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/ListId.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/ListId.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::ListId ;
BEGIN {
- $Config::Model::ListId::VERSION = '1.209';
+ $Config::Model::ListId::VERSION = '1.210';
}
use Config::Model::Exception ;
use Scalar::Util qw(weaken) ;
@@ -46,7 +46,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Loader.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Loader.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Loader.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Loader.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::Loader;
BEGIN {
- $Config::Model::Loader::VERSION = '1.209';
+ $Config::Model::Loader::VERSION = '1.210';
}
use Carp;
use strict;
@@ -44,7 +44,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Node.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Node.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Node.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Node.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::Node;
BEGIN {
- $Config::Model::Node::VERSION = '1.209';
+ $Config::Model::Node::VERSION = '1.210';
}
use Carp ;
use strict;
@@ -68,7 +68,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/ObjTreeScanner.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/ObjTreeScanner.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/ObjTreeScanner.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/ObjTreeScanner.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::ObjTreeScanner ;
BEGIN {
- $Config::Model::ObjTreeScanner::VERSION = '1.209';
+ $Config::Model::ObjTreeScanner::VERSION = '1.210';
}
use strict ;
use Config::Model::Exception ;
@@ -45,7 +45,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Report.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Report.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Report.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Report.pm Fri Oct 1 11:08:26 2010
@@ -28,7 +28,7 @@
package Config::Model::Report;
BEGIN {
- $Config::Model::Report::VERSION = '1.209';
+ $Config::Model::Report::VERSION = '1.210';
}
use Carp;
use strict;
@@ -45,7 +45,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Searcher.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Searcher.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Searcher.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Searcher.pm Fri Oct 1 11:08:26 2010
@@ -28,7 +28,7 @@
package Config::Model::Searcher;
BEGIN {
- $Config::Model::Searcher::VERSION = '1.209';
+ $Config::Model::Searcher::VERSION = '1.210';
}
use Log::Log4perl qw(get_logger :levels);
use Carp;
@@ -46,7 +46,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/SimpleUI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/SimpleUI.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/SimpleUI.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/SimpleUI.pm Fri Oct 1 11:08:26 2010
@@ -29,7 +29,7 @@
package Config::Model::SimpleUI ;
BEGIN {
- $Config::Model::SimpleUI::VERSION = '1.209';
+ $Config::Model::SimpleUI::VERSION = '1.210';
}
use Carp;
@@ -43,7 +43,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/TermUI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/TermUI.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/TermUI.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/TermUI.pm Fri Oct 1 11:08:26 2010
@@ -29,7 +29,7 @@
package Config::Model::TermUI ;
BEGIN {
- $Config::Model::TermUI::VERSION = '1.209';
+ $Config::Model::TermUI::VERSION = '1.210';
}
use Carp;
@@ -47,7 +47,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/Value.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/Value.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/Value.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/Value.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::Value ;
BEGIN {
- $Config::Model::Value::VERSION = '1.209';
+ $Config::Model::Value::VERSION = '1.210';
}
use warnings ;
use strict;
@@ -49,7 +49,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
@@ -686,20 +686,6 @@
if ($logger->is_debug) {
$logger->debug("Leaf '".$self->name."' set_properties called with '",
join("','",sort keys %args),"'");
- }
-
- # this code may be dead as warping value_type is no longer
- # authorized. But we keep it in case this has to be authorized
- # again.
- if ( not defined $args{value_type}
- or ( defined $args{value_type}
- and $args{value_type} eq 'enum'
- and not defined $args{choice}
- )
- ) {
- $args{level} = 'hidden';
- $self->set_owner_element_property ( \%args );
- return ;
}
$self->set_owner_element_property ( \%args );
@@ -1215,10 +1201,7 @@
my @error ;
- if ( $self->{hidden}) {
- push @error, "value is hidden" ;
- }
- elsif (not defined $value) {
+ if (not defined $value) {
# accept with no other check
}
elsif (not defined $self->{value_type} ) {
@@ -1301,7 +1284,7 @@
my @error = $self->check_value($value,$quiet) ;
- if (not $self->{hidden} and not defined $value and $self->{mandatory}) {
+ if (not defined $value and $self->{mandatory}) {
push @error, "Mandatory value is not defined" ;
}
Modified: trunk/libconfig-model-perl/lib/Config/Model/ValueComputer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/ValueComputer.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/ValueComputer.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/ValueComputer.pm Fri Oct 1 11:08:26 2010
@@ -27,7 +27,7 @@
package Config::Model::ValueComputer ;
BEGIN {
- $Config::Model::ValueComputer::VERSION = '1.209';
+ $Config::Model::ValueComputer::VERSION = '1.210';
}
use warnings ;
@@ -45,7 +45,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/WarpedNode.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/WarpedNode.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/WarpedNode.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/WarpedNode.pm Fri Oct 1 11:08:26 2010
@@ -28,7 +28,7 @@
package Config::Model::WarpedNode ;
BEGIN {
- $Config::Model::WarpedNode::VERSION = '1.209';
+ $Config::Model::WarpedNode::VERSION = '1.210';
}
use Carp qw(cluck croak);
@@ -47,7 +47,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/WarpedThing.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/WarpedThing.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/WarpedThing.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/WarpedThing.pm Fri Oct 1 11:08:26 2010
@@ -28,7 +28,7 @@
package Config::Model::WarpedThing ;
BEGIN {
- $Config::Model::WarpedThing::VERSION = '1.209';
+ $Config::Model::WarpedThing::VERSION = '1.210';
}
use strict;
use Scalar::Util qw(weaken) ;
@@ -51,7 +51,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/lib/Config/Model/WizardHelper.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/lib/Config/Model/WizardHelper.pm?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/lib/Config/Model/WizardHelper.pm (original)
+++ trunk/libconfig-model-perl/lib/Config/Model/WizardHelper.pm Fri Oct 1 11:08:26 2010
@@ -28,7 +28,7 @@
package Config::Model::WizardHelper ;
BEGIN {
- $Config::Model::WizardHelper::VERSION = '1.209';
+ $Config::Model::WizardHelper::VERSION = '1.210';
}
use Carp;
use strict;
@@ -45,7 +45,7 @@
=head1 VERSION
-version 1.209
+version 1.210
=head1 SYNOPSIS
Modified: trunk/libconfig-model-perl/t/warped_value.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/t/warped_value.t?rev=63136&op=diff
==============================================================================
--- trunk/libconfig-model-perl/t/warped_value.t (original)
+++ trunk/libconfig-model-perl/t/warped_value.t Fri Oct 1 11:08:26 2010
@@ -183,6 +183,7 @@
'm_value' => {
type => 'leaf',
value_type => 'enum',
+ level => 'hidden',
'warp'
=> {
follow => { m => '- macro' },
@@ -190,12 +191,15 @@
=> [
'$m eq "A" or $m eq "D"'
=> { choice => [qw/Av Bv/],
+ level => 'normal',
help => { Av => 'Av help'} ,
},
'$m eq "B"' => { choice => [qw/Bv Cv/],
+ level => 'normal',
help => { Bv => 'Bv help'} ,
},
'$m eq "C"' => { choice => [qw/Cv/],
+ level => 'normal',
help => { Cv => 'Cv help' } ,
}
]
@@ -204,18 +208,22 @@
'm_value_old' => {
type => 'leaf',
value_type => 'enum',
+ level => 'hidden',
'warp'
=> {
follow => '- macro',
'rules'
=> [
[qw/A D/] => { choice => [qw/Av Bv/],
+ level => 'normal',
help => { Av => 'Av help'} ,
},
B => { choice => [qw/Bv Cv/],
+ level => 'normal',
help => { Bv => 'Bv help'} ,
},
C => { choice => [qw/Cv/],
+ level => 'normal',
help => { Cv => 'Cv help' } ,
}
]
More information about the Pkg-perl-cvs-commits
mailing list