Changeset 190 for trunk


Ignore:
Timestamp:
07/11/15 23:29:33 (9 years ago)
Author:
kdeugau
Message:

/trunk

Tweak warnings and extend handling of dependency tags a little

  • add semisupport for "Supplements:" converted to "Enhances:" (since .deb packages do not yet support "Supplements:")
  • not sure why I missed "Obsoletes", but it's the rpm-native version of Debian-specific Replaces
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/debbuild

    r189 r190  
    10941094        $pkgdata{main}{recommends} .= ", $1";
    10951095        warn "Warning:  Debian-specific 'Recommends:' outside \%if wrapper\n" if $iflevel == 0;
     1096# As of sometime between RHEL 6 and RHEL 7 or so, support was added for Recommends: and Enhances:,
     1097# along with shiny new tag Supplements:.  We'll continue to warn about them for a while.
    10961098      } elsif (/^suggests:\s*(.+)/i) {
    10971099        $pkgdata{main}{suggests} .= ", $1";
    1098         warn "Warning:  Debian-specific 'Suggests:' outside \%if wrapper\n" if $iflevel == 0;
     1100        warn "Warning:  'Suggests:' outside \%if wrapper\n" if $iflevel == 0;
    10991101      } elsif (/^enhances:\s*(.+)/i) {
    11001102        $pkgdata{main}{enhances} .= ", $1";
    1101         warn "Warning:  Debian-specific 'Enhances:' outside \%if wrapper\n" if $iflevel == 0;
     1103        warn "Warning:  'Enhances:' outside \%if wrapper\n" if $iflevel == 0;
     1104      } elsif (/^supplements:\s*(.+)/i) {
     1105        $pkgdata{main}{enhances} .= ", $1";
     1106        warn "Warning:  'Supplements:' is not natively supported by .deb packages.  Downgrading relationship to Enhances:.\n";
    11021107      } elsif (/^replaces:\s*(.+)/i) {
    11031108        $pkgdata{main}{replaces} .= ", $1";
    1104         warn "Warning:  Debian-specific 'Replaces:' outside \%if wrapper\n" if $iflevel == 0;
     1109        warn "Warning:  'Replaces:' outside \%if wrapper\n" if $iflevel == 0;
     1110      } elsif (/^obsoletes:\s*(.+)/i) {
     1111        $pkgdata{main}{replaces} .= ", $1";
    11051112      } elsif (/^autoreq(?:prov)?:\s*(.+)/i) {
    11061113        # we don't handle auto-provides (yet)
Note: See TracChangeset for help on using the changeset viewer.