Changeset 254274e


Ignore:
Timestamp:
02/04/15 07:23:47 (5 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.1.2
Children:
da096cc
Parents:
2e22340d
Message:

Upadate AppCafe? web interface, don't show so many pkgs on Installed page,
only show top-level apps that aren't sucked in as a dep

Location:
src-webui/appweb/share/html/pages
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-webui/appweb/share/html/pages/appcafe-search.php

    r6fe0843 r254274e  
    5555 // Do the search 
    5656 if ( $searchraw == "checked" ) 
    57    $cmd = "pkg search $searchtext $jail 20"; 
     57   $cmd = "pkg search '$searchtext' $jail 20"; 
    5858 else 
    59    $cmd = "pbi search $searchtext all 20"; 
     59   $cmd = "pbi search '$searchtext' all 20"; 
    6060 
    6161 exec("$sc ". escapeshellarg("$cmd"), $pbiarray); 
  • src-webui/appweb/share/html/pages/sysapp.php

    rc643743 r254274e  
    6969     // Is this PBIs origin package installed? 
    7070     if ( array_search($pbiorigin, $pkglist) !== false) { 
     71       // Is this PBI just a DEP for another app? If so, skip it 
     72       $output=""; 
     73       exec("/usr/local/bin/syscache ".escapeshellarg("pkg $jail local $pbiorigin rdependencies"), $output); 
     74       if ( "$output[0]" != "$SCERROR" ) 
     75          continue; 
    7176 
    7277       parse_details($pbiorigin, "$jail", $col, true, false); 
Note: See TracChangeset for help on using the changeset viewer.