This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=96bd0097f60ec30ceaa3871e6f0f574af94f1dc1 commit 96bd0097f60ec30ceaa3871e6f0f574af94f1dc1 Author: Guillem Jover <[email protected]> AuthorDate: Mon Dec 26 21:52:26 2022 +0100 Dpkg::BuildEnv: Rename from Dpkg::Build::Env This makes this module use the current prevalent convention for the other Dpkg::BuildSomething modules. --- scripts/Dpkg/Arch.pm | 6 ++-- scripts/Dpkg/{Build/Env.pm => BuildEnv.pm} | 6 ++-- scripts/Dpkg/BuildFlags.pm | 34 ++++++++++---------- scripts/Dpkg/BuildOptions.pm | 6 ++-- scripts/Dpkg/BuildProfiles.pm | 8 ++--- scripts/Dpkg/Vendor.pm | 6 ++-- scripts/Makefile.am | 4 +-- scripts/dpkg-buildflags.pl | 6 ++-- scripts/po/POTFILES.in | 2 +- scripts/t/Dpkg_BuildEnv.t | 50 ++++++++++++++++++++++++++++++ scripts/t/Dpkg_Build_Env.t | 50 ------------------------------ 11 files changed, 89 insertions(+), 89 deletions(-) diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm index 8043e6174..3d8d09584 100644 --- a/scripts/Dpkg/Arch.pm +++ b/scripts/Dpkg/Arch.pm @@ -101,7 +101,7 @@ use List::Util qw(any); use Dpkg (); use Dpkg::Gettext; use Dpkg::ErrorHandling; -use Dpkg::Build::Env; +use Dpkg::BuildEnv; my (@cpu, @os); my (%cputable, %ostable); @@ -152,7 +152,7 @@ if available. sub get_build_arch() { - return Dpkg::Build::Env::get('DEB_BUILD_ARCH') || get_raw_build_arch(); + return Dpkg::BuildEnv::get('DEB_BUILD_ARCH') || get_raw_build_arch(); } { @@ -234,7 +234,7 @@ if available. sub get_host_arch() { - return Dpkg::Build::Env::get('DEB_HOST_ARCH') || get_raw_host_arch(); + return Dpkg::BuildEnv::get('DEB_HOST_ARCH') || get_raw_host_arch(); } =item @arch_list = get_valid_arches() diff --git a/scripts/Dpkg/Build/Env.pm b/scripts/Dpkg/BuildEnv.pm similarity index 93% rename from scripts/Dpkg/Build/Env.pm rename to scripts/Dpkg/BuildEnv.pm index 856d185fe..1b6295bc8 100644 --- a/scripts/Dpkg/Build/Env.pm +++ b/scripts/Dpkg/BuildEnv.pm @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. -package Dpkg::Build::Env; +package Dpkg::BuildEnv; use strict; use warnings; @@ -27,11 +27,11 @@ my %env_accessed = (); =head1 NAME -Dpkg::Build::Env - track build environment +Dpkg::BuildEnv - track build environment =head1 DESCRIPTION -The Dpkg::Build::Env module is used by dpkg-buildflags to track the build +The Dpkg::BuildEnv module is used by dpkg-buildflags to track the build environment variables being used and modified. =head1 FUNCTIONS diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm index 4fe69bbcc..2487f8681 100644 --- a/scripts/Dpkg/BuildFlags.pm +++ b/scripts/Dpkg/BuildFlags.pm @@ -23,7 +23,7 @@ our $VERSION = '1.05'; use Dpkg (); use Dpkg::Gettext; -use Dpkg::Build::Env; +use Dpkg::BuildEnv; use Dpkg::ErrorHandling; use Dpkg::Vendor qw(run_vendor_hook); @@ -172,20 +172,20 @@ sub load_environment_config { foreach my $flag (keys %{$self->{flags}}) { my $envvar = 'DEB_' . $flag . '_SET'; - if (Dpkg::Build::Env::has($envvar)) { - $self->set($flag, Dpkg::Build::Env::get($envvar), 'env'); + if (Dpkg::BuildEnv::has($envvar)) { + $self->set($flag, Dpkg::BuildEnv::get($envvar), 'env'); } $envvar = 'DEB_' . $flag . '_STRIP'; - if (Dpkg::Build::Env::has($envvar)) { - $self->strip($flag, Dpkg::Build::Env::get($envvar), 'env'); + if (Dpkg::BuildEnv::has($envvar)) { + $self->strip($flag, Dpkg::BuildEnv::get($envvar), 'env'); } $envvar = 'DEB_' . $flag . '_APPEND'; - if (Dpkg::Build::Env::has($envvar)) { - $self->append($flag, Dpkg::Build::Env::get($envvar), 'env'); + if (Dpkg::BuildEnv::has($envvar)) { + $self->append($flag, Dpkg::BuildEnv::get($envvar), 'env'); } $envvar = 'DEB_' . $flag . '_PREPEND'; - if (Dpkg::Build::Env::has($envvar)) { - $self->prepend($flag, Dpkg::Build::Env::get($envvar), 'env'); + if (Dpkg::BuildEnv::has($envvar)) { + $self->prepend($flag, Dpkg::BuildEnv::get($envvar), 'env'); } } } @@ -202,20 +202,20 @@ sub load_maintainer_config { foreach my $flag (keys %{$self->{flags}}) { my $envvar = 'DEB_' . $flag . '_MAINT_SET'; - if (Dpkg::Build::Env::has($envvar)) { - $self->set($flag, Dpkg::Build::Env::get($envvar), undef, 1); + if (Dpkg::BuildEnv::has($envvar)) { + $self->set($flag, Dpkg::BuildEnv::get($envvar), undef, 1); } $envvar = 'DEB_' . $flag . '_MAINT_STRIP'; - if (Dpkg::Build::Env::has($envvar)) { - $self->strip($flag, Dpkg::Build::Env::get($envvar), undef, 1); + if (Dpkg::BuildEnv::has($envvar)) { + $self->strip($flag, Dpkg::BuildEnv::get($envvar), undef, 1); } $envvar = 'DEB_' . $flag . '_MAINT_APPEND'; - if (Dpkg::Build::Env::has($envvar)) { - $self->append($flag, Dpkg::Build::Env::get($envvar), undef, 1); + if (Dpkg::BuildEnv::has($envvar)) { + $self->append($flag, Dpkg::BuildEnv::get($envvar), undef, 1); } $envvar = 'DEB_' . $flag . '_MAINT_PREPEND'; - if (Dpkg::Build::Env::has($envvar)) { - $self->prepend($flag, Dpkg::Build::Env::get($envvar), undef, 1); + if (Dpkg::BuildEnv::has($envvar)) { + $self->prepend($flag, Dpkg::BuildEnv::get($envvar), undef, 1); } } } diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm index 1feac3990..62a84ead1 100644 --- a/scripts/Dpkg/BuildOptions.pm +++ b/scripts/Dpkg/BuildOptions.pm @@ -24,7 +24,7 @@ our $VERSION = '1.02'; use Dpkg::Gettext; use Dpkg::ErrorHandling; -use Dpkg::Build::Env; +use Dpkg::BuildEnv; =encoding utf8 @@ -60,7 +60,7 @@ sub new { envvar => $opts{envvar} // 'DEB_BUILD_OPTIONS', }; bless $self, $class; - $self->merge(Dpkg::Build::Env::get($self->{envvar}), $self->{envvar}); + $self->merge(Dpkg::BuildEnv::get($self->{envvar}), $self->{envvar}); return $self; } @@ -220,7 +220,7 @@ sub export { my ($self, $var) = @_; $var //= $self->{envvar}; my $content = $self->output(); - Dpkg::Build::Env::set($var, $content); + Dpkg::BuildEnv::set($var, $content); return $content; } diff --git a/scripts/Dpkg/BuildProfiles.pm b/scripts/Dpkg/BuildProfiles.pm index 8684077f5..df3ec48ec 100644 --- a/scripts/Dpkg/BuildProfiles.pm +++ b/scripts/Dpkg/BuildProfiles.pm @@ -29,7 +29,7 @@ our @EXPORT_OK = qw( use Exporter qw(import); use List::Util qw(any); -use Dpkg::Build::Env; +use Dpkg::BuildEnv; my $cache_profiles; my @build_profiles; @@ -59,8 +59,8 @@ the environment variable B<DEB_BUILD_PROFILES>. sub get_build_profiles { return @build_profiles if $cache_profiles; - if (Dpkg::Build::Env::has('DEB_BUILD_PROFILES')) { - @build_profiles = split ' ', Dpkg::Build::Env::get('DEB_BUILD_PROFILES'); + if (Dpkg::BuildEnv::has('DEB_BUILD_PROFILES')) { + @build_profiles = split ' ', Dpkg::BuildEnv::get('DEB_BUILD_PROFILES'); } $cache_profiles = 1; @@ -79,7 +79,7 @@ sub set_build_profiles { $cache_profiles = 1; @build_profiles = @profiles; - Dpkg::Build::Env::set('DEB_BUILD_PROFILES', join ' ', @profiles); + Dpkg::BuildEnv::set('DEB_BUILD_PROFILES', join ' ', @profiles); } =item @profiles = parse_build_profiles($string) diff --git a/scripts/Dpkg/Vendor.pm b/scripts/Dpkg/Vendor.pm index cb818833e..059e44223 100644 --- a/scripts/Dpkg/Vendor.pm +++ b/scripts/Dpkg/Vendor.pm @@ -36,7 +36,7 @@ use List::Util qw(uniq); use Dpkg (); use Dpkg::ErrorHandling; use Dpkg::Gettext; -use Dpkg::Build::Env; +use Dpkg::BuildEnv; use Dpkg::Control::HashCore; my $origins = "$Dpkg::CONFDIR/origins"; @@ -175,8 +175,8 @@ If that file doesn't exist, it returns undef. sub get_current_vendor() { my $f; - if (Dpkg::Build::Env::has('DEB_VENDOR')) { - $f = get_vendor_info(Dpkg::Build::Env::get('DEB_VENDOR')); + if (Dpkg::BuildEnv::has('DEB_VENDOR')) { + $f = get_vendor_info(Dpkg::BuildEnv::get('DEB_VENDOR')); return $f->{'Vendor'} if defined $f; } $f = get_vendor_info(); diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 41c258a97..680b7bd34 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -62,10 +62,10 @@ CLEANFILES = \ perllibdir = $(PERL_LIBDIR) nobase_dist_perllib_DATA = \ Dpkg/Arch.pm \ + Dpkg/BuildEnv.pm \ Dpkg/BuildFlags.pm \ Dpkg/BuildOptions.pm \ Dpkg/BuildProfiles.pm \ - Dpkg/Build/Env.pm \ Dpkg/Build/Info.pm \ Dpkg/Build/Types.pm \ Dpkg/Changelog.pm \ @@ -215,11 +215,11 @@ test_scripts = \ t/Dpkg_Package.t \ t/Dpkg_Shlibs_Cppfilt.t \ t/Dpkg_Shlibs.t \ + t/Dpkg_BuildEnv.t \ t/Dpkg_BuildFlags.t \ t/Dpkg_BuildFlags_Ubuntu.t \ t/Dpkg_BuildOptions.t \ t/Dpkg_BuildProfiles.t \ - t/Dpkg_Build_Env.t \ t/Dpkg_Build_Info.t \ t/Dpkg_Build_Types.t \ t/Dpkg_Checksums.t \ diff --git a/scripts/dpkg-buildflags.pl b/scripts/dpkg-buildflags.pl index 33c4c92fe..1489f327d 100755 --- a/scripts/dpkg-buildflags.pl +++ b/scripts/dpkg-buildflags.pl @@ -24,7 +24,7 @@ use warnings; use Dpkg (); use Dpkg::Gettext; use Dpkg::ErrorHandling qw(:DEFAULT report REPORT_STATUS); -use Dpkg::Build::Env; +use Dpkg::BuildEnv; use Dpkg::BuildFlags; use Dpkg::Vendor qw(get_current_vendor); @@ -152,7 +152,7 @@ if ($action eq 'list') { # also show which ones could have set to modify it). printf "Vendor: %s\n", Dpkg::Vendor::get_current_vendor() || 'undefined'; print "Environment:\n"; - for my $envvar (Dpkg::Build::Env::list_accessed()) { + for my $envvar (Dpkg::BuildEnv::list_accessed()) { print " $envvar=$ENV{$envvar}\n" if exists $ENV{$envvar}; } @@ -191,7 +191,7 @@ if ($action eq 'list') { # First print all environment variables that might have changed the # results (only existing ones, might make sense to add an option to # also show which ones could have set to modify it). - my @envvars = Dpkg::Build::Env::list_accessed(); + my @envvars = Dpkg::BuildEnv::list_accessed(); for my $envvar (@envvars) { if (exists $ENV{$envvar}) { printf report(REPORT_STATUS, 'environment variable %s=%s', diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index b456a9ed4..6fc21a4a9 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -19,10 +19,10 @@ scripts/dpkg-source.pl scripts/dpkg-vendor.pl scripts/Dpkg.pm scripts/Dpkg/Arch.pm +scripts/Dpkg/BuildEnv.pm scripts/Dpkg/BuildFlags.pm scripts/Dpkg/BuildOptions.pm scripts/Dpkg/BuildProfiles.pm -scripts/Dpkg/Build/Env.pm scripts/Dpkg/Build/Info.pm scripts/Dpkg/Build/Types.pm scripts/Dpkg/Changelog.pm diff --git a/scripts/t/Dpkg_BuildEnv.t b/scripts/t/Dpkg_BuildEnv.t new file mode 100644 index 000000000..a53c7702f --- /dev/null +++ b/scripts/t/Dpkg_BuildEnv.t @@ -0,0 +1,50 @@ +#!/usr/bin/perl +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + +use strict; +use warnings; + +use Test::More tests => 14; + +BEGIN { + use_ok('Dpkg::BuildEnv'); +} + +$ENV{DPKG_TEST_VAR_A} = 100; +$ENV{DPKG_TEST_VAR_B} = 200; +delete $ENV{DPKG_TEST_VAR_Z}; + +is(scalar Dpkg::BuildEnv::list_accessed(), 0, 'no accessed variables'); +is(scalar Dpkg::BuildEnv::list_modified(), 0, 'no modified variables'); + +is(Dpkg::BuildEnv::get('DPKG_TEST_VAR_A'), 100, 'get value'); + +is(scalar Dpkg::BuildEnv::list_accessed(), 1, '1 accessed variables'); +is(scalar Dpkg::BuildEnv::list_modified(), 0, 'no modified variables'); + +is(Dpkg::BuildEnv::get('DPKG_TEST_VAR_B'), 200, 'get value'); +Dpkg::BuildEnv::set('DPKG_TEST_VAR_B', 300); +is(Dpkg::BuildEnv::get('DPKG_TEST_VAR_B'), 300, 'set value'); + +is(scalar Dpkg::BuildEnv::list_accessed(), 2, '2 accessed variables'); +is(scalar Dpkg::BuildEnv::list_modified(), 1, '1 modified variable'); + +ok(Dpkg::BuildEnv::has('DPKG_TEST_VAR_A'), 'variables is present'); +ok(!Dpkg::BuildEnv::has('DPKG_TEST_VAR_Z'), 'variables is not present'); + +is(scalar Dpkg::BuildEnv::list_accessed(), 3, '2 accessed variables'); +is(scalar Dpkg::BuildEnv::list_modified(), 1, '1 modified variable'); + +1; diff --git a/scripts/t/Dpkg_Build_Env.t b/scripts/t/Dpkg_Build_Env.t deleted file mode 100644 index 90733d56c..000000000 --- a/scripts/t/Dpkg_Build_Env.t +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/perl -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. - -use strict; -use warnings; - -use Test::More tests => 14; - -BEGIN { - use_ok('Dpkg::Build::Env'); -} - -$ENV{DPKG_TEST_VAR_A} = 100; -$ENV{DPKG_TEST_VAR_B} = 200; -delete $ENV{DPKG_TEST_VAR_Z}; - -is(scalar Dpkg::Build::Env::list_accessed(), 0, 'no accessed variables'); -is(scalar Dpkg::Build::Env::list_modified(), 0, 'no modified variables'); - -is(Dpkg::Build::Env::get('DPKG_TEST_VAR_A'), 100, 'get value'); - -is(scalar Dpkg::Build::Env::list_accessed(), 1, '1 accessed variables'); -is(scalar Dpkg::Build::Env::list_modified(), 0, 'no modified variables'); - -is(Dpkg::Build::Env::get('DPKG_TEST_VAR_B'), 200, 'get value'); -Dpkg::Build::Env::set('DPKG_TEST_VAR_B', 300); -is(Dpkg::Build::Env::get('DPKG_TEST_VAR_B'), 300, 'set value'); - -is(scalar Dpkg::Build::Env::list_accessed(), 2, '2 accessed variables'); -is(scalar Dpkg::Build::Env::list_modified(), 1, '1 modified variable'); - -ok(Dpkg::Build::Env::has('DPKG_TEST_VAR_A'), 'variables is present'); -ok(!Dpkg::Build::Env::has('DPKG_TEST_VAR_Z'), 'variables is not present'); - -is(scalar Dpkg::Build::Env::list_accessed(), 3, '2 accessed variables'); -is(scalar Dpkg::Build::Env::list_modified(), 1, '1 modified variable'); - -1; -- Dpkg.Org's dpkg
