[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.4.1-25-g5bece51
Mehdi Dogguy
dogguy at pps.jussieu.fr
Thu May 28 14:28:03 UTC 2009
The following commit has been merged in the master branch:
commit eb7f348e39195edcfcde9ef97d1fbc19d4d2fda7
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date: Thu May 28 16:10:47 2009 +0200
Don't print errors in git-dom-*-patches
diff --git a/git-tools/git-dom-apply-patches b/git-tools/git-dom-apply-patches
index 34da082..e5aa4cf 100755
--- a/git-tools/git-dom-apply-patches
+++ b/git-tools/git-dom-apply-patches
@@ -14,7 +14,7 @@ else
## When master:debian/patches/series doesn't exist, git cat-file
## will produce an empty output (along with an error on stderr).
- for patch in `git cat-file -p master:debian/patches/series`; do
+ for patch in `git cat-file -p master:debian/patches/series 2>/dev/null`; do
git cat-file -p master:debian/patches/$patch | git am;
done
fi
diff --git a/git-tools/git-dom-save-patches b/git-tools/git-dom-save-patches
index 83ad3d2..8aff732 100755
--- a/git-tools/git-dom-save-patches
+++ b/git-tools/git-dom-save-patches
@@ -28,10 +28,10 @@ else
git branch -D $PATCH_BRANCH
echo "Cleaning patches…"
- sed -i 1d debian/patches/*.patch
+ sed -i 1d debian/patches/*.patch 2>/dev/null
## Hackish: Remove 2 last lines
# sed -i -n -e :a -e '1,2!{P;N;D;};N;ba' debian/patches/*.patch
- for patch in `ls -1 debian/patches/*.patch`; do
+ for patch in `ls -1 debian/patches/*.patch 2>/dev/null`; do
clean_patch $patch
done
fi
--
dh-ocaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list