pbulk upload: ensure rsync ran before moving dirs.

Should avoid joyent/pkgsrc#447 when rsync=:
TritonDataCenter · Jan 1, 2017 · bddd881 · bddd881
1 parent 8d5431c
commit bddd881
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/pkgtools/pbulk/files/pbulk/scripts/upload b/pkgtools/pbulk/files/pbulk/scripts/upload
@@ -90,13 +90,15 @@ else
 	# on tmpdest as that is usually a hidden directory, avoiding directory
 	# listings showing the old directory while it is being deleted.
 	ssh ${pkg_rsync_target_host} "
-		if [ -d ${pkg_rsync_target_linkdest} ]; then
-			mv ${pkg_rsync_target_linkdest} ${pkg_rsync_target_tmpdest}-old
-		else
-			mkdir -p $(dirname ${pkg_rsync_target_linkdest})
+		if [ -f ${pkg_rsync_target_tmpdest}/All/pkg_summary.gz ]; then
+			if [ -d ${pkg_rsync_target_linkdest} ]; then
+				mv ${pkg_rsync_target_linkdest} ${pkg_rsync_target_tmpdest}-old
+			else
+				mkdir -p $(dirname ${pkg_rsync_target_linkdest})
+			fi
+			mv ${pkg_rsync_target_tmpdest} ${pkg_rsync_target_linkdest}
+			rm -rf ${pkg_rsync_target_tmpdest}-old
 		fi
-		mv ${pkg_rsync_target_tmpdest} ${pkg_rsync_target_linkdest}
-		rm -rf ${pkg_rsync_target_tmpdest}-old
 	"
 fi