Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master quill by Jaka Kranjc (ae5114df49f000dbaf6711515bceeff7f684f927)

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 master quill by Jaka Kranjc (ae5114df49f000dbaf6711515bceeff7f684f927)
  • Date: Wed, 11 Apr 2007 04:50:32 -0500

GIT changes to master quill by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

var/lib/quill/ChangeLog | 5 +++++
var/lib/quill/modules/libcore | 1 +
var/lib/quill/modules/libhistory | 14 +++++++++-----
var/lib/quill/version | 2 +-
4 files changed, 16 insertions(+), 6 deletions(-)

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

* libcore: forgot a HISTORY entry when manually updating the source
urls
* libhistory: made adding entries idempotent, more exotic field
delimiter

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 358bc3a..3f10cae 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcore: forgot a HISTORY entry when manually updating the source
urls
+ * libhistory: made adding entries idempotent, more exotic field
delimiter
+ * version: 0.2.4-rc14
+
2007-04-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcore, quill: added check_executable_bits
* version: 0.2.4-rc13
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 50cff9a..2abe801 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -319,6 +319,7 @@ function check_source_urls() {
error_msg "SOURCE${i}_URL[0] is hopelessly broken! Fix it manually."
sleep 2
quill_edit DETAILS
+ add_history_entry "DETAILS: Fixed SOURCE${i}_URL[0]"
rc=1
fi
fi
diff --git a/var/lib/quill/modules/libhistory
b/var/lib/quill/modules/libhistory
index e7728d8..9a8aa16 100644
--- a/var/lib/quill/modules/libhistory
+++ b/var/lib/quill/modules/libhistory
@@ -32,13 +32,17 @@ function add_history_entry()
then
# check if we already have an entry for the same file
file="${1%%:*}"
- if [[ -z $(sed -n "1,/^\s*$/ s,\* $file:,&,p" HISTORY) ]]
- then
+ if [[ -z $(sed -n "1,/^\s*$/ s%\* $file:%&%p" HISTORY) ]]
+ then # we don't
sed -i "/$title/ a\\\t* $1" HISTORY
else
- sed -i "1,/^\s*$/ {
- /\* $file:/ a\\\t ${1#*:}
- }" HISTORY
+ # we do, but first check that the new addition is unique
+ if ! sed -n "1,/^\s*$/p" HISTORY | grep -qF "* $1"
+ then
+ sed -i "1,/^\s*$/ {
+ /\* $file:/ a\\\t ${1#*:}
+ }" HISTORY
+ fi
fi
else # first time today
sed -i "1 s%^.*$%$title\n\t* $1\n\n&%" HISTORY
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 6e8ec87..bde8220 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.4-rc13
+0.2.4-rc14



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (ae5114df49f000dbaf6711515bceeff7f684f927), Jaka Kranjc, 04/11/2007

Archive powered by MHonArc 2.6.24.

Top of Page