* [PATCH] blkid/Makefile.in: ignore rmdir non-empty dir error
@ 2009-09-28 10:57 Peng Tao
2009-10-04 2:29 ` Theodore Tso
2009-10-04 2:47 ` Theodore Tso
0 siblings, 2 replies; 3+ messages in thread
From: Peng Tao @ 2009-09-28 10:57 UTC (permalink / raw)
To: linux-ext4; +Cc: Theodore Ts'o, Peng Tao
Otherwise, make clean returns the following error, which is missleading.
rmdir tests
rmdir: failed to remove `tests': Directory not empty
make: [clean] Error 1 (ignored)
Signed-off-by: Peng Tao <bergwolf@gmail.com>
---
lib/blkid/Makefile.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index 9169226..618c0b2 100644
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -181,7 +181,7 @@ clean::
tests/*.img results test_probe core profiled/* \
checker/* blkid_types.h ../libblkid.a ../libblkid_p.a \
$(SMANPAGES) blkid
- -rmdir tests
+ -rmdir --ignore-fail-on-non-empty tests
mostlyclean:: clean
distclean:: clean
--
1.6.5.rc2.262.g5224f
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] blkid/Makefile.in: ignore rmdir non-empty dir error
2009-09-28 10:57 [PATCH] blkid/Makefile.in: ignore rmdir non-empty dir error Peng Tao
@ 2009-10-04 2:29 ` Theodore Tso
2009-10-04 2:47 ` Theodore Tso
1 sibling, 0 replies; 3+ messages in thread
From: Theodore Tso @ 2009-10-04 2:29 UTC (permalink / raw)
To: Peng Tao; +Cc: linux-ext4
On Mon, Sep 28, 2009 at 06:57:22PM +0800, Peng Tao wrote:
> checker/* blkid_types.h ../libblkid.a ../libblkid_p.a \
> $(SMANPAGES) blkid
> - -rmdir tests
> + -rmdir --ignore-fail-on-non-empty tests
>
Sorry, NACK. This will blow up on systems that aren't using the GNU
shellutils. The error is ignored, which is good enough. We can do
something like this instead:
@echo rmdir tests/tmp tests
-@rmdir tests/tmp tests >& /dev/null
If we really care, I suppose.
- Ted
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] blkid/Makefile.in: ignore rmdir non-empty dir error
2009-09-28 10:57 [PATCH] blkid/Makefile.in: ignore rmdir non-empty dir error Peng Tao
2009-10-04 2:29 ` Theodore Tso
@ 2009-10-04 2:47 ` Theodore Tso
1 sibling, 0 replies; 3+ messages in thread
From: Theodore Tso @ 2009-10-04 2:47 UTC (permalink / raw)
To: Peng Tao; +Cc: linux-ext4
On Mon, Sep 28, 2009 at 06:57:22PM +0800, Peng Tao wrote:
> Otherwise, make clean returns the following error, which is missleading.
> rmdir tests
> rmdir: failed to remove `tests': Directory not empty
> make: [clean] Error 1 (ignored)
>
> Signed-off-by: Peng Tao <bergwolf@gmail.com>
This is what I checked in instead.
- Ted
commit 7822f784f1edf767cc74044e02702a6d44cee267
Author: Theodore Ts'o <tytso@mit.edu>
Date: Sat Oct 3 22:33:47 2009 -0400
blkid: Avoid a potentially error message when running "make clean"
This error isn't terribly important, but apparently it causes some
users/developers distress.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index 9169226..9339718 100644
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -181,7 +181,8 @@ clean::
tests/*.img results test_probe core profiled/* \
checker/* blkid_types.h ../libblkid.a ../libblkid_p.a \
$(SMANPAGES) blkid
- -rmdir tests
+ @echo rmdir tests/tmp tests
+ @(rmdir tests/tmp tests 2> /dev/null ; exit 0)
mostlyclean:: clean
distclean:: clean
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-10-04 2:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-28 10:57 [PATCH] blkid/Makefile.in: ignore rmdir non-empty dir error Peng Tao
2009-10-04 2:29 ` Theodore Tso
2009-10-04 2:47 ` Theodore Tso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).