[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] fix on "dirty" tree

From: Andrey Borzenkov
Subject: [PATCH] fix on "dirty" tree
Date: Tue, 9 Apr 2013 20:20:26 +0400

address@hidden:~/obs/home:arvidjaar:grub2-next/grub2/grub-2.00> LC_MESSAGES=C 
Importing unicode...
Importing libgcrypt...
WARNING: grub-core/lib/libgcrypt-grub already exists
WARNING: grub-core/lib/libgcrypt-grub/cipher already exists
WARNING: grub-core/lib/libgcrypt-grub/mpi already exists
WARNING: grub-core/lib/libgcrypt-grub/src already exists
ln: failed to create symbolic link 
'grub-core/lib/libgcrypt-grub/mpi/mpih-add1.c': File exists

These files are symbolic links, so was not caught by "test -f". Use
"test -h".

Signed-off-by: Andrey Borzenkov <address@hidden>

 ChangeLog  | 5 +++++ | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 083d86a..ecd6752 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-09  Andrey Borzenkov <address@hidden>
+       * Use "-h", not "-f", to test for existence of symbolic
+       links under grub-core/lib/libgcrypt-grub/mpi.
 2013-04-08  Andrey Borzenkov <address@hidden>
        * grub-core/Makefile.core.def: Add kern/elfXX.c to elf module
diff --git a/ b/
index 7a4b5c8..d47650b 100755
--- a/
+++ b/
@@ -24,7 +24,7 @@ ln -s ../../../grub-core/lib/libgcrypt-grub/src/g10lib.h 
 cp -R grub-core/lib/libgcrypt/mpi/generic 
 for x in mpi-asm-defs.h mpih-add1.c mpih-sub1.c mpih-mul1.c mpih-mul2.c 
mpih-mul3.c mpih-lshift.c mpih-rshift.c; do
-    if [ -f grub-core/lib/libgcrypt-grub/mpi/"$x" ]; then
+    if [ -h grub-core/lib/libgcrypt-grub/mpi/"$x" ]; then
        rm grub-core/lib/libgcrypt-grub/mpi/"$x"
     ln -s generic/"$x" grub-core/lib/libgcrypt-grub/mpi/"$x"
tg: (d051a42..) u/libcrypt-autogen (depends on: master)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]