diff options
author | Ismael Luceno | 2011-04-25 23:59:16 -0300 |
---|---|---|
committer | Ismael Luceno | 2011-04-26 00:17:49 -0300 |
commit | 1bdde4cc73e8de5f49e7564b79dc28a34dc40c0f (patch) | |
tree | d933c40957cea18e08b8f55061f840aacd076e7d | |
parent | 2e8d08c3a6d9c58faa9c76e5f682e7d68f286d7f (diff) |
Add support for bzr_http and fix depending spells
To fix downloads from Launchpad, which doesn't support bzr protocol.
-rwxr-xr-x | bzr_download.function | 7 | ||||
-rwxr-xr-x | disk/partimage-ng/DETAILS | 6 | ||||
-rw-r--r-- | disk/partimage-ng/HISTORY | 3 | ||||
-rwxr-xr-x | xorg-driver/wizardpen/DETAILS | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/bzr_download.function b/bzr_download.function index a0886308e7..86d79180ca 100755 --- a/bzr_download.function +++ b/bzr_download.function @@ -2,6 +2,9 @@ ## Handler for downloading from bzr URLs #--------------------------------------------------------------------- function bzr_download() { + local URL="${SOURCE_URL%:*}" + URL="${URL#bzr_}" + if file_exists $SOURCE_CACHE/$SOURCE then message "${MESSAGE_COLOR}Unpacking the source...${DEFAULT_COLOR}" && @@ -13,8 +16,8 @@ function bzr_download() { cd - else message "${MESSAGE_COLOR}Doing a lightweight checkout...${DEFAULT_COLOR}" && - echo bzr checkout --lightweight ${SOURCE_URL%:*} $SOURCE_DIRECTORY && - bzr checkout --lightweight ${SOURCE_URL%:*} $SOURCE_DIRECTORY + echo bzr checkout --lightweight "$URL" "$SOURCE_DIRECTORY" && + bzr checkout --lightweight "$URL" "$SOURCE_DIRECTORY" fi && message "${MESSAGE_COLOR}Repacking the source...${DEFAULT_COLOR}" && diff --git a/disk/partimage-ng/DETAILS b/disk/partimage-ng/DETAILS index 5597375dee..c06d73a858 100755 --- a/disk/partimage-ng/DETAILS +++ b/disk/partimage-ng/DETAILS @@ -2,10 +2,10 @@ if [[ "${PARTIMAGE_NG_SCM_AUTOUPDATE}" == y ]]; then VERSION=$(date +%Y%m%d) else - VERSION=bzr + VERSION=trunk fi - SOURCE=$SPELL-bzr.tar.bz2 - SOURCE_URL[0]=bzr://bazaar.launchpad.net/~vonami/partimage-ng/trunk + SOURCE=$SPELL-trunk.tar.bz2 + SOURCE_URL[0]=bzr_http://bazaar.launchpad.net/~vonami/partimage-ng/trunk:$SPELL-trunk SOURCE_IGNORE=volatile FORCE_DOWNLOAD=on SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY index bc394fb843..05a87bf543 100644 --- a/disk/partimage-ng/HISTORY +++ b/disk/partimage-ng/HISTORY @@ -1,3 +1,6 @@ +2011-04-25 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: Fixed SOURCE_URL[0] + 2011-01-23 Ismael Luceno <ismael@sourcemage.org> * DETAILS, PREPARE: expanded url removed whitespace at the end of lines diff --git a/xorg-driver/wizardpen/DETAILS b/xorg-driver/wizardpen/DETAILS index f34ccbe500..0f960429f1 100755 --- a/xorg-driver/wizardpen/DETAILS +++ b/xorg-driver/wizardpen/DETAILS @@ -7,7 +7,7 @@ fi SOURCE="wizardpen-trunk.tar.bz2" FORCE_DOWNLOAD=on SOURCE_IGNORE=volatile - SOURCE_URL[0]=bzr://bazaar.launchpad.net/~wizardpen-devs/wizardpen/trunk/:$SPELL-trunk + SOURCE_URL[0]=bzr_http://bazaar.launchpad.net/~wizardpen-devs/wizardpen/trunk/:$SPELL-trunk SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-trunk" WEB_SITE="https://launchpad.net/wizardpen" LICENSE[0]=GPL |