diff options
| author |   Dan Armak <danarmak@gentoo.org> | 2002-09-16 14:44:20 +0000 |
|---|---|---|
| committer | Dan Armak <danarmak@gentoo.org> | 2002-09-16 14:44:20 +0000 |
| commit | f4041bc70d9e12df3ae9717ef42518655140cac9 (patch) | |
| tree | 12fb9d5c1480edf2c3cefdf556fbe66e94c7f295 /eclass | |
| parent | Enabled LOGIN authentication to support Micro$oft mail clients. (diff) | |
| download | gentoo-2-f4041bc70d9e12df3ae9717ef42518655140cac9.tar.gz gentoo-2-f4041bc70d9e12df3ae9717ef42518655140cac9.tar.bz2 gentoo-2-f4041bc70d9e12df3ae9717ef42518655140cac9.zip | |
clean up cvs_src_unpack's copying of sources from the cvs dir into the workdir; fix a minor bug where unwanted dirs in doc/ were being copied
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/cvs.eclass | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass index e1e582f8fc24..709b7a78cee8 100644 --- a/eclass/cvs.eclass +++ b/eclass/cvs.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Dan Armak <danarmak@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.18 2002/09/15 14:15:54 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.19 2002/09/16 14:44:20 danarmak Exp $ # This eclass provides the generic cvs fetching functions. ECLASS=cvs @@ -206,18 +206,24 @@ cvs_src_unpack() { debug-print-function $FUNCNAME $* cvs_fetch || die "died running cvs_fetch" - einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." - debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." + einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..." + debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..." + + # probably redundant, but best to make sure + mkdir -p $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR if [ -n "$ECVS_SUBDIR" ]; then - mkdir -p $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR - cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/* $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/ + if [ -n "$ECVS_LOCAL" ]; then + cp -f $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/* $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR + else + cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR $WORKDIR/$ECVS_MODULE + fi else - if [ -n "$ECVS_LOCAL" ]; then - cp -f $ECVS_TOP_DIR/$ECVS_MODULE/* $WORKDIR/$ECVS_MODULE - else - cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR - fi + if [ -n "$ECVS_LOCAL" ]; then + cp -f $ECVS_TOP_DIR/$ECVS_MODULE/* $WORKDIR/$ECVS_MODULE + else + cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR + fi fi # if the directory is empty, remove it; empty directories cannot exist in cvs. |