Prechádzať zdrojové kódy

Dpkg::Vendor::Debian: Do not use Dpkg::Vendor::Ubuntu, just require it

The fact that Dpkg::Vendor::Debian needs to use functions from
Dpkg::Vendor::Ubuntu has always been all kinds of a broken design, as
an obvious layer violation, but at least for now we avoid redefinition
of functions.
Guillem Jover 13 rokov pred
rodič
commit
a616f22100
1 zmenil súbory, kde vykonal 2 pridanie a 1 odobranie
  1. 2 1
      scripts/Dpkg/Vendor/Debian.pm

+ 2 - 1
scripts/Dpkg/Vendor/Debian.pm

@@ -29,7 +29,6 @@ use base qw(Dpkg::Vendor::Default);
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
 use Dpkg::Control::Types;
-use Dpkg::Vendor::Ubuntu;
 use Dpkg::BuildOptions;
 use Dpkg::Arch qw(get_host_arch debarch_to_debtriplet);
 
@@ -61,6 +60,8 @@ sub run_hook {
 	    }
 	}
 
+	# XXX: Layer violation...
+	require Dpkg::Vendor::Ubuntu;
 	my $b = Dpkg::Vendor::Ubuntu::find_launchpad_closes($ch_info->{'Changes'});
 	foreach my $bug (@$b) {
 	    $$textref .= "Bug-Ubuntu: https://bugs.launchpad.net/bugs/$bug\n";