From 9e6de149990e85dec877db841f8f7522fdb5f7ca Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 18 Jul 2005 05:44:43 +0000 Subject: [PATCH] Made a couple of fixes for handling release uploads correctly. --- releasetools/Targets.mk | 4 ++++ releasetools/Variables.mk | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk index b85537369..5b3bb4c56 100644 --- a/releasetools/Targets.mk +++ b/releasetools/Targets.mk @@ -156,15 +156,19 @@ endif install: zip -$(FTP) $(FTP_OPTS) "mput -O $(SF_UPLOAD_DIR) $(TMP)/docbook-$(DISTRO)-*-$(ZIPVER).*; quit" $(SF_UPLOAD_HOST) + -$(FTP) $(FTP_OPTS) "mput -O $(SF_UPLOAD_DIR) $(TMP)/docbook-$(DISTRO)-$(ZIPVER).*; quit" $(SF_UPLOAD_HOST) $(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-$(ZIPVER).tar.bz2 $(PROJECT_USER)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/ + $(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2 $(PROJECT_USER)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/ $(SSH) $(SSH_OPTS)-l $(PROJECT_USER) $(PROJECT_HOST) \ "(\ umask 002; \ cd $(RELEASE_DIR)/$(DISTRO); \ rm -rf $(ZIPVER); \ tar xfj docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \ + tar xfj docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2; \ mv docbook-$(DISTRO)-$(ZIPVER) $(ZIPVER); \ rm -rf docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \ + rm -rf docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2; \ chmod -R g+w $(ZIPVER); \ rm -f current; \ ln -s $(ZIPVER) current; \ diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk index d2171060e..20f7b34bb 100644 --- a/releasetools/Variables.mk +++ b/releasetools/Variables.mk @@ -83,7 +83,7 @@ endif ZIP_EXCLUDES = \ /CVS$$ \ /CVS/ \ - /debian/ \ + /debian \ \.classes \ ~$$ \ \..*\.pyc \ -- 2.40.0