Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (8795ab3c8b3bbaad19d2764c86b9892f5deddae4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (8795ab3c8b3bbaad19d2764c86b9892f5deddae4)
  • Date: Wed, 29 Dec 2010 01:36:38 -0600

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

FUNCTIONS | 1 +
bzr_download.function | 23 +++++++++++++++++++++++
disk/partimage-ng/DOWNLOAD | 18 ------------------
disk/partimage-ng/HISTORY | 5 ++++-
editors/emacs/DOWNLOAD | 20 ++++----------------
editors/emacs/HISTORY | 3 +++
6 files changed, 35 insertions(+), 35 deletions(-)

New commits:
commit 8795ab3c8b3bbaad19d2764c86b9892f5deddae4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

Move bzr_download function to it's own file, so it can be shared
and fix emacs download for tarball releases

diff --git a/FUNCTIONS b/FUNCTIONS
index 5f7a089..6e26adc 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -719,3 +719,4 @@ fi
}

. $GRIMOIRE/glselect.function
+. $GRIMOIRE/bzr_download.function
diff --git a/bzr_download.function b/bzr_download.function
new file mode 100644
index 0000000..ebfac46
--- /dev/null
+++ b/bzr_download.function
@@ -0,0 +1,23 @@
+#---------------------------------------------------------------------
+## Handler for downloading from bzr URLs
+#---------------------------------------------------------------------
+function bzr_download() {
+ if [ $SOURCE_CACHE/$SOURCE ]
+ then
+ message "${MESSAGE_COLOR}Unpacking the source...${DEFAULT_COLOR}" &&
+ tar xjf $SOURCE_CACHE/$SOURCE &&
+ cd $SOURCE_DIRECTORY &&
+ message "${MESSAGE_COLOR}Updating...${DEFAULT_COLOR}" &&
+ echo bzr update &&
+ bzr update &&
+ 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
+ fi &&
+
+ message "${MESSAGE_COLOR}Repacking the source...${DEFAULT_COLOR}" &&
+ tar cjf $SOURCE $SOURCE_DIRECTORY &&
+ mv $SOURCE $SOURCE_CACHE
+}
diff --git a/disk/partimage-ng/DOWNLOAD b/disk/partimage-ng/DOWNLOAD
index 85e5e94..922adc2 100755
--- a/disk/partimage-ng/DOWNLOAD
+++ b/disk/partimage-ng/DOWNLOAD
@@ -1,21 +1,3 @@
-bzr_download() {
-local OLD
-OLD=$SOURCE_CACHE/$SOURCE
-if [[ -e $OLD ]];then
- echo unpacking old tarball
- tar xjf $OLD
- cd $SPELL
- echo updating source tree
- bzr update
- cd -
-else
- echo fetching source tree
- bzr checkout $SOURCE_URL $SPELL
-fi
-echo repacking tarball
-tar cjf $SOURCE $SPELL
-mv $SOURCE $OLD
-}
#if [[ $PART_VCS == y ]];then
bzr_download
#else
diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY
index 48b398a..807d409 100644
--- a/disk/partimage-ng/HISTORY
+++ b/disk/partimage-ng/HISTORY
@@ -1,3 +1,6 @@
+2010-12-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: bzr_download function moved to it's own file
+
2010-10-11 Bor Kraljič <pyrobor AT ver.si>
* DOWNLOAD: only PART_VCS can be downloaded
(other version is commented in DETAILS)
@@ -9,7 +12,7 @@
* PRE_BUILD, {hal,ntfs}.diff: deleted
* DEPENDS: rearrange
* PREPARE: give warning message
-
+
2009-11-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* ntfs.diff: added
diff --git a/editors/emacs/DOWNLOAD b/editors/emacs/DOWNLOAD
index 8de5d43..db3a814 100755
--- a/editors/emacs/DOWNLOAD
+++ b/editors/emacs/DOWNLOAD
@@ -1,18 +1,6 @@
-if [ $SOURCE_CACHE/$SOURCE ]
+if [ "$VCS" ]
then
- message "${MESSAGE_COLOR}Unpacking the source...${DEFAULT_COLOR}" &&
- tar xjf $SOURCE_CACHE/$SOURCE &&
- cd $SOURCE_DIRECTORY &&
- message "${MESSAGE_COLOR}Updating...${DEFAULT_COLOR}" &&
- echo bzr update &&
- bzr update &&
- cd -
+ bzr_download
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
-fi &&
-
-message "${MESSAGE_COLOR}Repacking the source...${DEFAULT_COLOR}" &&
-tar cjf $SOURCE $SOURCE_DIRECTORY &&
-mv $SOURCE $SOURCE_CACHE
+ default_download
+fi
diff --git a/editors/emacs/HISTORY b/editors/emacs/HISTORY
index 7b00bd5..705f78c 100644
--- a/editors/emacs/HISTORY
+++ b/editors/emacs/HISTORY
@@ -1,3 +1,6 @@
+2010-12-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: bzr_download function moved to it's own file
+
2010-12-07 Ismael Luceno <ismael AT sourcemage.org>
* DOWNLOAD: manually handle, until bzr support finds it's way into
sorcery




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (8795ab3c8b3bbaad19d2764c86b9892f5deddae4), Ismael Luceno, 12/29/2010

Archive powered by MHonArc 2.6.24.

Top of Page