Changeset 79596

Timestamp:

06/19/11 13:44:54 (4 years ago)

Author:

jmr@…

Message:

merge r79591, r79592 from trunk:

ln needs -h to replace a symlink to a directory
Change directories when tarring

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/portmgr/jobs/mprsyncup (modified) (2 diffs)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/portmgr/jobs/mprsyncup

@@ -160 +160 @@
 ${MKDIR} -p ${TAR_CURDIR}
 cp -pR ${TAR_CURDIR} ${RSYNCROOT}/release/tarballs_old
-${LN} -sf tarballs_old ${RSYNCROOT}/release/tarballs
-${TAR} -cf ${TAR_CURDIR}/base.tar ${RSYNCROOT}/release/base
-${TAR} -cf ${TAR_CURDIR}/ports.tar --exclude 'PortIndex*' ${RSYNCROOT}/release/ports
+${LN} -sfh tarballs_old ${RSYNCROOT}/release/tarballs
+${TAR} -C ${RSYNCROOT}/release/ -cf ${TAR_CURDIR}/base.tar base
+${TAR} --exclude 'PortIndex*' -C ${RSYNCROOT}/release/ -cf ${TAR_CURDIR}/ports.tar ports
 cp -pR ${RSYNCROOT}/release/ports/PortIndex_* ${TAR_CURDIR}
 # XXX needs PRIVKEY to be set above
@@ -170 +170 @@
     #${OPENSSL} dgst -ripemd160 -sign ${PRIVKEY} -out ${index}.rmd160 ${index}
 done
-${LN} -sf tarballs_current ${RSYNCROOT}/release/tarballs
+${LN} -sfh tarballs_current ${RSYNCROOT}/release/tarballs
 ${RM} -rf ${RSYNCROOT}/release/tarballs_old