diff options
author | Raphaël Hertzog <hertzog@debian.org> | 2009-10-09 16:39:26 +0200 |
---|---|---|
committer | Raphaël Hertzog <hertzog@debian.org> | 2009-10-09 16:39:26 +0200 |
commit | 6e1998224f8a218257b9af8ed3e3e082698d1a8a (patch) | |
tree | 6bb5e7764dd3b02e0f82ab731851da470c3c7403 /scripts | |
parent | 2a194c6cc6e534d090b9c99b6ef53b5b1a0e2ce1 (diff) | |
download | dpkg-6e1998224f8a218257b9af8ed3e3e082698d1a8a.tar.gz |
Dpkg::Control: rename CTRL_APT_* to CTRL_INDEX_*
The Packages and Sources files are not really specific to APT.
Those files are indexes that can be used by other programs.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Dpkg/Control.pm | 12 | ||||
-rw-r--r-- | scripts/Dpkg/Control/Fields.pm | 34 | ||||
-rw-r--r-- | scripts/Dpkg/Control/Types.pm | 8 | ||||
-rw-r--r-- | scripts/Dpkg/Vendor/Debian.pm | 4 | ||||
-rwxr-xr-x | scripts/dpkg-scanpackages.pl | 2 | ||||
-rwxr-xr-x | scripts/dpkg-scansources.pl | 2 |
6 files changed, 31 insertions, 31 deletions
diff --git a/scripts/Dpkg/Control.pm b/scripts/Dpkg/Control.pm index 60c458f23..568de5679 100644 --- a/scripts/Dpkg/Control.pm +++ b/scripts/Dpkg/Control.pm @@ -26,8 +26,8 @@ use Dpkg::Control::Hash; use Dpkg::Control::Fields; use base qw(Dpkg::Control::Hash Exporter); -our @EXPORT = qw(CTRL_UNKNOWN CTRL_INFO_SRC CTRL_INFO_PKG CTRL_APT_SRC - CTRL_APT_PKG CTRL_PKG_SRC CTRL_PKG_DEB CTRL_FILE_CHANGES +our @EXPORT = qw(CTRL_UNKNOWN CTRL_INFO_SRC CTRL_INFO_PKG CTRL_INDEX_SRC + CTRL_INDEX_PKG CTRL_PKG_SRC CTRL_PKG_DEB CTRL_FILE_CHANGES CTRL_FILE_VENDOR CTRL_FILE_STATUS CTRL_CHANGELOG); =head1 NAME @@ -61,12 +61,12 @@ a Debian source package. Corresponds to subsequent blocks of information in a debian/control file in a Debian source package. -=item CTRL_APT_SRC +=item CTRL_INDEX_SRC Corresponds to an entry in a Sources file of an APT source package repository. -=item CTRL_APT_PKG +=item CTRL_INDEX_PKG Corresponds to an entry in a Packages file of an APT binary package repository. @@ -149,9 +149,9 @@ sub set_options { $$self->{'name'} = _g("package's section of control info file"); } elsif ($t == CTRL_CHANGELOG) { $$self->{'name'} = _g("parsed version of changelog"); - } elsif ($t == CTRL_APT_SRC) { + } elsif ($t == CTRL_INDEX_SRC) { $$self->{'name'} = sprintf(_g("entry of APT's %s file"), "Sources"); - } elsif ($t == CTRL_APT_PKG) { + } elsif ($t == CTRL_INDEX_PKG) { $$self->{'name'} = sprintf(_g("entry of APT's %s file"), "Packages"); } elsif ($t == CTRL_PKG_SRC) { $$self->{'name'} = sprintf(_g("%s file"), ".dsc"); diff --git a/scripts/Dpkg/Control/Fields.pm b/scripts/Dpkg/Control/Fields.pm index 94475e52a..afdaf5703 100644 --- a/scripts/Dpkg/Control/Fields.pm +++ b/scripts/Dpkg/Control/Fields.pm @@ -33,8 +33,8 @@ our @EXPORT = qw(field_capitalize field_is_official field_is_allowed_in field_insert_after field_insert_before); use constant { - ALL_PKG => CTRL_INFO_PKG | CTRL_APT_PKG | CTRL_PKG_DEB | CTRL_FILE_STATUS, - ALL_SRC => CTRL_INFO_SRC | CTRL_APT_SRC | CTRL_PKG_SRC, + ALL_PKG => CTRL_INFO_PKG | CTRL_INDEX_PKG | CTRL_PKG_DEB | CTRL_FILE_STATUS, + ALL_SRC => CTRL_INFO_SRC | CTRL_INDEX_SRC | CTRL_PKG_SRC, ALL_CHANGES => CTRL_FILE_CHANGES | CTRL_CHANGELOG, }; @@ -109,7 +109,7 @@ our %FIELDS = ( allowed => ALL_PKG | CTRL_FILE_CHANGES, }, 'Directory' => { - allowed => CTRL_APT_SRC, + allowed => CTRL_INDEX_SRC, }, 'Distribution' => { allowed => ALL_CHANGES, @@ -123,7 +123,7 @@ our %FIELDS = ( allowed => ALL_PKG, }, 'Filename' => { - allowed => CTRL_APT_PKG, + allowed => CTRL_INDEX_PKG, }, 'Files' => { allowed => CTRL_PKG_SRC | CTRL_FILE_CHANGES, @@ -167,7 +167,7 @@ our %FIELDS = ( dep_order => 1, }, 'Priority' => { - allowed => CTRL_INFO_SRC | CTRL_APT_SRC | ALL_PKG, + allowed => CTRL_INFO_SRC | CTRL_INDEX_SRC | ALL_PKG, }, 'Provides' => { allowed => ALL_PKG, @@ -185,14 +185,14 @@ our %FIELDS = ( dep_order => 8, }, 'Section' => { - allowed => CTRL_INFO_SRC | CTRL_APT_SRC | ALL_PKG, + allowed => CTRL_INFO_SRC | CTRL_INDEX_SRC | ALL_PKG, }, 'Size' => { - allowed => CTRL_APT_PKG, + allowed => CTRL_INDEX_PKG, }, 'Source' => { allowed => (ALL_PKG | ALL_SRC | ALL_CHANGES) & - (~(CTRL_APT_SRC | CTRL_INFO_PKG)), + (~(CTRL_INDEX_SRC | CTRL_INFO_PKG)), }, 'Standards-Version' => { allowed => ALL_SRC, @@ -269,7 +269,7 @@ my @checksum_fields = map { field_capitalize("Checksums-$_") } @check_supported; my @sum_fields = map { $_ eq "md5" ? "MD5sum" : field_capitalize($_) } @check_supported; &field_register($_, CTRL_PKG_SRC | CTRL_FILE_CHANGES) foreach @checksum_fields; -&field_register($_, CTRL_APT_PKG) foreach @sum_fields; +&field_register($_, CTRL_INDEX_PKG) foreach @sum_fields; our %FIELD_ORDER = ( CTRL_PKG_DEB() => [ @@ -302,15 +302,15 @@ our %FIELD_ORDER = ( Triggers-Awaited) ], ); -# Order for CTRL_APT_PKG is derived from CTRL_PKG_DEB -$FIELD_ORDER{CTRL_APT_PKG()} = [ @{$FIELD_ORDER{CTRL_PKG_DEB()}} ]; -&field_insert_before(CTRL_APT_PKG, 'Section', 'Filename', 'Size', @sum_fields); -# Order for CTRL_APT_SRC is derived from CTRL_PKG_SRC -$FIELD_ORDER{CTRL_APT_SRC()} = [ @{$FIELD_ORDER{CTRL_PKG_SRC()}} ]; -@{$FIELD_ORDER{CTRL_APT_SRC()}} = map { $_ eq "Source" ? "Package" : $_ } +# Order for CTRL_INDEX_PKG is derived from CTRL_PKG_DEB +$FIELD_ORDER{CTRL_INDEX_PKG()} = [ @{$FIELD_ORDER{CTRL_PKG_DEB()}} ]; +&field_insert_before(CTRL_INDEX_PKG, 'Section', 'Filename', 'Size', @sum_fields); +# Order for CTRL_INDEX_SRC is derived from CTRL_PKG_SRC +$FIELD_ORDER{CTRL_INDEX_SRC()} = [ @{$FIELD_ORDER{CTRL_PKG_SRC()}} ]; +@{$FIELD_ORDER{CTRL_INDEX_SRC()}} = map { $_ eq "Source" ? "Package" : $_ } @{$FIELD_ORDER{CTRL_PKG_SRC()}}; -&field_insert_after(CTRL_APT_SRC, "Version", "Priority", "Section"); -&field_insert_before(CTRL_APT_SRC, "Checksums-Md5", "Directory"); +&field_insert_after(CTRL_INDEX_SRC, "Version", "Priority", "Section"); +&field_insert_before(CTRL_INDEX_SRC, "Checksums-Md5", "Directory"); # Register vendor specifics fields foreach my $op (run_vendor_hook("register-custom-fields")) { diff --git a/scripts/Dpkg/Control/Types.pm b/scripts/Dpkg/Control/Types.pm index 7908f6d1d..19a8fe4c5 100644 --- a/scripts/Dpkg/Control/Types.pm +++ b/scripts/Dpkg/Control/Types.pm @@ -1,8 +1,8 @@ package Dpkg::Control::Types; use base qw(Exporter); -our @EXPORT = qw(CTRL_UNKNOWN CTRL_INFO_SRC CTRL_INFO_PKG CTRL_APT_SRC - CTRL_APT_PKG CTRL_PKG_SRC CTRL_PKG_DEB CTRL_FILE_CHANGES +our @EXPORT = qw(CTRL_UNKNOWN CTRL_INFO_SRC CTRL_INFO_PKG CTRL_INDEX_SRC + CTRL_INDEX_PKG CTRL_PKG_SRC CTRL_PKG_DEB CTRL_FILE_CHANGES CTRL_FILE_VENDOR CTRL_FILE_STATUS CTRL_CHANGELOG); =head1 NAME @@ -23,8 +23,8 @@ use constant { CTRL_UNKNOWN => 0, CTRL_INFO_SRC => 1, # First control block in debian/control CTRL_INFO_PKG => 2, # Subsequent control blocks in debian/control - CTRL_APT_SRC => 4, # Entry in APT's Packages files - CTRL_APT_PKG => 8, # Entry in APT's Sources files + CTRL_INDEX_SRC => 4, # Entry in APT's Packages files + CTRL_INDEX_PKG => 8, # Entry in APT's Sources files CTRL_PKG_SRC => 16, # .dsc file of source package CTRL_PKG_DEB => 32, # DEBIAN/control in binary packages CTRL_FILE_CHANGES => 64, # .changes file diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index e234b7be9..275bf1d50 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -42,8 +42,8 @@ sub run_hook { } elsif ($hook eq "register-custom-fields") { return ( [ "register", "Dm-Upload-Allowed", - CTRL_INFO_SRC | CTRL_APT_SRC | CTRL_PKG_SRC ], - [ "insert_after", CTRL_APT_SRC, "Uploaders", "Dm-Upload-Allowed" ], + CTRL_INFO_SRC | CTRL_INDEX_SRC | CTRL_PKG_SRC ], + [ "insert_after", CTRL_INDEX_SRC, "Uploaders", "Dm-Upload-Allowed" ], [ "insert_after", CTRL_PKG_SRC, "Uploaders", "Dm-Upload-Allowed" ], ); } else { diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl index 173377bf8..cc8752eca 100755 --- a/scripts/dpkg-scanpackages.pl +++ b/scripts/dpkg-scanpackages.pl @@ -186,7 +186,7 @@ FILE: next; } - my $fields = Dpkg::Control->new(type => CTRL_APT_PKG); + my $fields = Dpkg::Control->new(type => CTRL_INDEX_PKG); my $temp = $control; while ($temp =~ s/^\n*(\S+):[ \t]*(.*(\n[ \t].*)*)\n//) { my ($key, $value) = ($1, $2); diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl index c9611faeb..6c7ba75ea 100755 --- a/scripts/dpkg-scansources.pl +++ b/scripts/dpkg-scansources.pl @@ -262,7 +262,7 @@ sub process_dsc { # Parse ‘.dsc’ file. my $fields = Dpkg::Control->new(type => CTRL_PKG_SRC); $fields->parse($file); - $fields->set_options(type => CTRL_APT_SRC); + $fields->set_options(type => CTRL_INDEX_SRC); # Get checksums my $size; |