[SCM] Debian native package for Config::Model::Dpkg branch, master, updated. 2e47bb04483ba458f2b1fbf48b5f36ffcf5a54fc
Dominique Dumont
dod at debian.org
Sun Sep 30 13:45:32 UTC 2012
The following commit has been merged in the master branch:
commit 8ed5b2ca921540521e6576f59414f24c206ba811
Author: Dominique Dumont <dod at debian.org>
Date: Sun Sep 30 15:15:54 2012 +0200
fixed tests after split
diff --git a/t/debian-dpkg.t b/t/debian-dpkg.t
index 84110fe..ed1d123 100644
--- a/t/debian-dpkg.t
+++ b/t/debian-dpkg.t
@@ -62,7 +62,7 @@ rmtree($wr_root);
mkpath($wr_root, { mode => 0755 }) ;
my $dpkg = $model->instance(
- root_class_name => 'Debian::Dpkg',
+ root_class_name => 'Dpkg',
root_dir => $wr_root,
);
diff --git a/t/model_tests.d/debian-dpkg-control-test-conf.pl b/t/model_tests.d/debian-dpkg-control-test-conf.pl
index b1b94b0..d3f915e 100644
--- a/t/model_tests.d/debian-dpkg-control-test-conf.pl
+++ b/t/model_tests.d/debian-dpkg-control-test-conf.pl
@@ -3,7 +3,7 @@ use IO::File;
$conf_file_name = "control";
$conf_dir = 'debian';
-$model_to_test = "Debian::Dpkg::Control";
+$model_to_test = "Dpkg::Control";
eval { require AptPkg::Config ;} ;
$skip = ( $@ or not -r '/etc/debian_version') ? 1 : 0 ;
@@ -142,13 +142,13 @@ my $ch = new IO::File "$cache_file";
foreach ($ch->getlines) {
chomp;
my ($k,$v) = split m/ => / ;
- $Config::Model::Debian::Dependency::cache{$k} = time . ' '. $v ;
+ $Config::Model::Dpkg::Dependency::cache{$k} = time . ' '. $v ;
}
$ch -> close ;
END {
return if $::DebianDependencyCacheWritten ;
- my %h = %Config::Model::Debian::Dependency::cache ;
+ my %h = %Config::Model::Dpkg::Dependency::cache ;
map { s/^\d+ //;} values %h ; # remove time stamp
my $str = join ("\n", map { "$_ => $h{$_}" ;} sort keys %h) ;
diff --git a/t/model_tests.d/debian-dpkg-copyright-test-conf.pl b/t/model_tests.d/debian-dpkg-copyright-test-conf.pl
index 84a23c9..164f832 100644
--- a/t/model_tests.d/debian-dpkg-copyright-test-conf.pl
+++ b/t/model_tests.d/debian-dpkg-copyright-test-conf.pl
@@ -4,7 +4,7 @@ use utf8;
$conf_file_name = "copyright";
$conf_dir = 'debian';
-$model_to_test = "Debian::Dpkg::Copyright";
+$model_to_test = "Dpkg::Copyright";
eval { require AptPkg::Config ;} ;
$skip = ( $@ or not -r '/etc/debian_version') ? 1 : 0 ;
diff --git a/t/model_tests.d/debian-dpkg-patch-test-conf.pl b/t/model_tests.d/debian-dpkg-patch-test-conf.pl
index 430feda..006ac61 100644
--- a/t/model_tests.d/debian-dpkg-patch-test-conf.pl
+++ b/t/model_tests.d/debian-dpkg-patch-test-conf.pl
@@ -6,7 +6,7 @@ use File::HomeDir ;
$conf_file_name = "some-patch";
$conf_dir = 'debian/patches';
-$model_to_test = "Debian::Dpkg::Patch";
+$model_to_test = "Dpkg::Patch";
eval { require AptPkg::Config; };
$skip = ( $@ or not -r '/etc/debian_version' ) ? 1 : 0;
diff --git a/t/model_tests.d/debian-dpkg-test-conf.pl b/t/model_tests.d/debian-dpkg-test-conf.pl
index 198ca8c..f53da76 100644
--- a/t/model_tests.d/debian-dpkg-test-conf.pl
+++ b/t/model_tests.d/debian-dpkg-test-conf.pl
@@ -4,7 +4,7 @@ use File::HomeDir ;
$conf_file_name = "";
$conf_dir = '';
-$model_to_test = "Debian::Dpkg";
+$model_to_test = "Dpkg";
eval { require AptPkg::Config; };
$skip = ( $@ or not -r '/etc/debian_version' ) ? 1 : 0;
@@ -62,13 +62,13 @@ my $ch = new IO::File "$cache_file";
foreach ( $ch->getlines ) {
chomp;
my ( $k, $v ) = split m/ => /;
- $Config::Model::Debian::Dependency::cache{$k} = time . ' '. $v;
+ $Config::Model::Dpkg::Dependency::cache{$k} = time . ' '. $v;
}
$ch->close;
END {
return if $::DebianDependencyCacheWritten;
- my %h = %Config::Model::Debian::Dependency::cache;
+ my %h = %Config::Model::Dpkg::Dependency::cache;
map { s/^\d+ //;} values %h ; # remove time stamp
my $str = join( "\n", map { "$_ => $h{$_}"; } sort keys %h );
--
Debian native package for Config::Model::Dpkg
More information about the Pkg-perl-cvs-commits
mailing list