Changeset 764 in MondoRescue for trunk/tools/pkg2ftp


Ignore:
Timestamp:
Aug 8, 2006, 12:34:37 AM (18 years ago)
Author:
Bruno Cornec
Message:

merge -r728:763 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/tools/pkg2ftp

    r729 r764  
    66#
    77
     8
     9(
    810dname=`dirname $0`
    911prem=`echo $dname |cut -c1`
    … …  
    5658            ar=$ARCH
    5759        fi
    58         pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv${suf}.${ar}.rpm"
    59         spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv${suf}.src.rpm"
     60        pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
     61        spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${TAG}${suf}.src.rpm"
    6062    elif [  _"$dtype" = "_deb" ]; then
    61         pkg="$pkg ${TOPBUILDDIR}/$p_*.rpm"
     63        pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"
    6264        spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
    6365    fi
    … …  
    6769ssh ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
    6870scp ${pkg} ${spkg} ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}
     71) 2>&1 | tee /tmp/pkg2ftp.log
Note: See TracChangeset for help on using the changeset viewer.