Changeset d5d5aa1


Ignore:
Timestamp:
04/24/13 15:58:00 (17 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
84406a4
Parents:
98b904e
Message:

Remove old EVENT_PIPE stuff

Add conflict checker to package installation

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-metapkgmanager/pc-metapkgmanager

    r1620346 rd5d5aa1  
    7575        fi 
    7676 
    77         # Running from a GUI? 
    78         if [ -n "$PCFETCHGUI" ] ; then 
    79           # Setup EVENT_PIPE 
    80           EVENT_PIPE="/tmp/pkgpipe.$$" 
    81           export EVENT_PIPE 
    82           mkfifo $EVENT_PIPE 
    83           echo "EVENT_PIPE: $EVENT_PIPE" 
    84  
    85           # Wait for QT to open the pipe file 
    86           sleep 5 
    87  
    88         fi 
    89  
    9077        # Lets pre-download all packages 
    9178        download_cache_packages "pkg-static install -U -n $pkgName" 
    9279 
     80        # Lets check for any conflicts doing this install 
     81        check_pkg_conflicts "install -U -F -y $pkgName" 
     82        if [ $? -ne 0 ] ; then 
     83                exit 1 
     84        fi 
     85 
    9386        # Time to run pkgng and let it install packages! 
    94         pkg install -yLf "$pkgName" 
    95  
    96         # Cleanup EVENT_PIPE 
    97         if [ -n "$PCFETCHGUI" ] ; then 
    98           rm $EVENT_PIPE 
    99         fi 
     87        pkg install -yUf "$pkgName" 
    10088 
    10189        # Make sure the program appears fully installed now, if not set error 
Note: See TracChangeset for help on using the changeset viewer.