Changeset 134


Ignore:
Timestamp:
10/31/07 16:11:53 (17 years ago)
Author:
kdeugau
Message:

/trunk

Convert build-dep version check block to use dpkg --compare-versions.
Drop attempts to allow or'ed deps, because rpm doesn't support them.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/debbuild

    r133 r134  
    13791379      $reqflag = 0;
    13801380    } else {
    1381 # gotta be a better way to do this... :/
    1382       if ($rel eq '>=' && !($reqver ge $ver)) {
    1383         print " * Buildreq $pkg is installed, but wrong version ($reqver):  Need $ver\n";
     1381      my ($resp) = qx { dpkg --compare-versions $reqver '$rel' $ver && echo "ok" };
     1382      if ($resp !~ /^ok/) {
    13841383        $reqflag = 0;
    1385       }
    1386       if ($rel eq '>' && !($reqver gt $ver)) {
    1387         print " * Buildreq $pkg is installed, but wrong version ($reqver):  Need $ver\n";
    1388         $reqflag = 0;
    1389       }
    1390       if ($rel eq '<=' && !($reqver le $ver)) {
    1391         print " * Buildreq $pkg is installed, but wrong version ($reqver):  Need $ver\n";
    1392         $reqflag = 0;
    1393       }
    1394       if ($rel eq '<' && !($reqver lt $ver)) {
    1395         print " * Buildreq $pkg is installed, but wrong version ($reqver):  Need $ver\n";
    1396         $reqflag = 0;
    1397       }
    1398       if ($rel eq '=' && !($reqver eq $ver)) {
    1399         print " * Buildreq $pkg is installed, but wrong version ($reqver):  Need $ver\n";
    1400         $reqflag = 0;
     1384        print " * Buildreq $pkg is installed, but wrong version ($reqver):  Need $ver\n"
    14011385      }
    14021386    } # end not installed/installed check
Note: See TracChangeset for help on using the changeset viewer.