Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (1c11e2c12eda711b3602cb48d3bbde1de50f4533)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (1c11e2c12eda711b3602cb48d3bbde1de50f4533)
  • Date: Tue, 2 Sep 2008 16:34:16 -0500

GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 6 ++++++
etc/sorcery/version | 2 +-
var/lib/sorcery/modules/build_api/common | 3 +++
var/lib/sorcery/modules/libgpg | 6 +++---
4 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 1c11e2c12eda711b3602cb48d3bbde1de50f4533
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

1.14.2-rc1

commit 4e8d144ac7fa52133358e5b34a41c67ad58b7af2
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libgpg: set LC_ALL=C for commands output of which we parse #14705

(cherry-picked from commit 7aafabba713f654279b7a2a0b7ccf8f9c72170c1)

commit b26690bfe61ea7b3892ac65c14722b48c11bef9c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

common: remove the doc dir if nothing was installed in gather_docs

(cherry-picked from commit 544ab7b250579f0f751828a5497a195e4a565fc0)

diff --git a/ChangeLog b/ChangeLog
old mode 100644
new mode 100755
index 4b08bc9..2c3d861
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libgpg: set LC_ALL=C for commands output of which we parse #14705
+
+2008-09-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * common: remove the doc dir if nothing was installed in gather_docs
+
2008-08-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* common: when staging, gather_docs into the stage, the live system is
not available at this point (rightly so) #14197
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 63e799c..999af48 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.1
+1.14.2-rc1
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 211e150..f3295fe 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -194,6 +194,9 @@ function real_gather_docs() { (
# making installed docs readable for all users.
chmod -fR a+r $DEST_DIR

+ # remove the doc dir if nothing was installed
+ rmdir $DEST_DIR 2> /dev/null
+
fi

) }
diff --git a/var/lib/sorcery/modules/libgpg b/var/lib/sorcery/modules/libgpg
index 7373daf..8c5350a 100755
--- a/var/lib/sorcery/modules/libgpg
+++ b/var/lib/sorcery/modules/libgpg
@@ -52,7 +52,7 @@ function gpg_verify_signature() { # $1 sig $2 file $3
pubring $4 algo var
return 200
else
local output=$TMP_DIR/$(basename $file).gpgout
- gpg --no-default-keyring \
+ LC_ALL=C gpg --no-default-keyring \
--always-trust \
--keyring $keyring \
--batch \
@@ -336,7 +336,7 @@ function gpg_user_query() {
function gpg_hashsum() {
local algorithm=$1
local file=$2
- gpg --print-md "$algorithm" "$file"| tr -d '\n ' |cut -f2 -d:|
+ LC_ALL=C gpg --print-md "$algorithm" "$file"| tr -d '\n ' |cut -f2 -d:|
tr 'A-F' 'a-f'|tr -d '\n'
echo " $file"
}
@@ -348,7 +348,7 @@ function gpg_hashsum() {
## This assumes the caller has already verified that gpg is installed.
#---------------------------------------------------------------------
function gpg_get_hashes() {
- gpg --version 2> /dev/null | grep '^Hash' | awk -F: '{ print $2 }' | tr ,
' ' | tr 'A-Z' 'a-z'
+ LC_ALL=C gpg --version 2> /dev/null | grep '^Hash' | awk -F: '{ print $2
}' | tr , ' ' | tr 'A-Z' 'a-z'
}

#---------------------------------------------------------------------



  • [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (1c11e2c12eda711b3602cb48d3bbde1de50f4533), Jaka Kranjc, 09/02/2008

Archive powered by MHonArc 2.6.24.

Top of Page