Changeset 6647d23


Ignore:
Timestamp:
05/16/14 07:38:19 (15 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
53c9649
Parents:
f0784a8 (diff), 7626cf4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager/pbi-manager

    r30e337f r7626cf4  
    11371137        fi 
    11381138        if [ -z "$PBI_SHORTDESC" ] ; then 
    1139                 PBI_SHORTDESC="`${PKG_CMD} rquery -U '%c' ${PBI_ORIGIN} | awk 1 ORS=' ' | sed 's|  |<br>|g' | sed 's|*|-|g'`" 
     1139                PBI_SHORTDESC="`${PKG_CMD} rquery -U '%c' ${PBI_ORIGIN} | awk 1 ORS='<br>' | sed 's|*|-|g'`" 
    11401140        fi 
    11411141        if [ -z "$PBI_DESC" ] ; then 
    1142                 PBI_DESC="`${PKG_CMD} rquery -U '%e' ${PBI_ORIGIN} | awk 1 ORS=' ' | sed 's|  |<br>|g' | sed 's|*|-|g'`" 
     1142                PBI_DESC="`${PKG_CMD} rquery -U '%e' ${PBI_ORIGIN} | awk 1 ORS='<br>' | sed 's|*|-|g'`" 
    11431143        fi 
    11441144 
  • src-qt4/pc-softwaremanager/mainUI.cpp

    r79d31c1 rf0784a8  
    455455  //Add the info to the body of the email 
    456456  cmd.append("&body="); 
    457   cmd.append("-----------\nPBI Information:\nName: "+app.name + "\nDate Installed: "+app.installedwhen +"\nVersion: "+app.installedversion ); 
     457  cmd.append("-----------\\nPBI Information:\\nName: "+app.name + "\\nDate Installed: "+app.installedwhen +"\\nVersion: "+app.installedversion ); 
    458458  //Startup the command externally 
    459   PBI->runCmdAsUser("xdg-open \""+cmd+"\""); 
     459  PBI->runCmdAsUser("xdg-open \'"+cmd+"\'"); 
    460460} 
    461461 
Note: See TracChangeset for help on using the changeset viewer.