Changeset 24129

Show
Ignore:
Timestamp:
10/25/09 14:02:43 (4 weeks ago)
Author:
broder
Message:

In xsession:

  • Demote mitmailutils to a recommendation while it's uninstallable on krb4-less systems.
Location:
trunk/debathena/debathena/xsession/debian
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/debathena/debathena/xsession/debian/changelog

    r23871 r24129  
     1debathena-xsession (1.11) unstable; urgency=low 
     2 
     3  * Demote mitmailutils to a recommendation while it's uninstallable on 
     4    krb4-less systems. 
     5 
     6 -- Evan Broder <broder@mit.edu>  Sun, 25 Oct 2009 14:02:38 -0400 
     7 
    18debathena-xsession (1.10.2) unstable; urgency=low 
    29 

  • trunk/debathena/debathena/xsession/debian/control.in

    r23856 r24129  
    1010Depends: x11-common, zenity, debathena-pam-config, debathena-zephyr-config, 
    1111 debathena-get-message, debathena-lert, debathena-authwatch, debathena-quota, 
    12  debathena-mailquota, tcsh, xterm, ${misc:Depends} 
    13 Recommends: debathena-bash, debathena-tcsh 
     12 tcsh, xterm, ${misc:Depends} 
     13Recommends: debathena-bash, debathena-tcsh, debathena-mitmailutils 
    1414Replaces: debathena-dotfiles-x11 
    1515Conflicts: debathena-dotfiles-x11, debathena-dotfiles (<< 10.0.2-0debathena3) 

  • trunk/debathena/debathena/xsession/debian/quotawarn

    r23449 r24129  
    3030fi 
    3131 
    32 # Determine the user's mail usage and quota. 
    33 qline=`mailquota | tail -n +2` 
    34 usage=`echo "$qline" | awk '{print $2}'` 
    35 quota=`echo "$qline" | awk '{print $3}'` 
    36 warnlevel=`expr "${quota:-0}" - ${tolerance}` 
     32if hash mailquota 2>/dev/null; then 
     33    # Determine the user's mail usage and quota. 
     34    qline=`mailquota | tail -n +2` 
     35    usage=`echo "$qline" | awk '{print $2}'` 
     36    quota=`echo "$qline" | awk '{print $3}'` 
     37    warnlevel=`expr "${quota:-0}" - ${tolerance}` 
    3738 
    38 if [ -n "$usage" -a -n "$warnlevel" ] && [ "$usage" -ge "$warnlevel" ]; then 
    39   zenity --info --text=" 
     39    if [ -n "$usage" -a -n "$warnlevel" ] && [ "$usage" -ge "$warnlevel" ]; then 
     40        zenity --info --text=" 
    4041Your MIT mail usage is close to or exceeding your mail 
    4142quota (${usage}KB used out of ${quota}KB).  Consider 
    … …  
    4546 
    4647  mailusage" 
    47 fi 
     48    fi