[PATCH 1/2] build-sys: remove swap-common.h from sys-utils/Makemodule.am

[PATCH 1/2] build-sys: remove swap-common.h from sys-utils/Makemodule.am

[Sami Kerola]

The commit 25a365e moved the file to include/

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 sys-utils/Makemodule.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 4741fed..ca47df8 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -253,8 +253,7 @@ dist_man_MANS += \
 
 swapon_SOURCES = \
 	sys-utils/swapon.c \
-	sys-utils/swapon-common.c \
-	sys-utils/swapon-common.h
+	sys-utils/swapon-common.c
 swapon_CFLAGS = $(AM_CFLAGS) \
 	-I$(ul_libblkid_incdir) \
 	-I$(ul_libmount_incdir) \
-- 
2.0.3

[PATCH 2/2] tests: fix rename subdir check that was failing in travis

[Sami Kerola]

Apparently some or all travis build servers has a bit older coreutils
version.  The coreutils v8.13 added a feature to readlink that allows
user to specify multiple arguments.  Earlier versions gave exactly the
type of error travis_script log has.

+readlink: extra operand `rename_aa/sublink.2'
+Try `readlink --help' for more information.

The commit 0f85e0535bd4e6d19fadca182e4d57660b6bb57b introduced the travis
realpath issue to happen.

Reference: https://travis-ci.org/karelzak/util-linux/builds/30538376
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 tests/ts/rename/subdir | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/ts/rename/subdir b/tests/ts/rename/subdir
index f83b2bf..4ae7005 100755
--- a/tests/ts/rename/subdir
+++ b/tests/ts/rename/subdir
@@ -35,7 +35,9 @@ for i in rename_a{a,b}/sublink.{1..3}; do
 	ln -s rename/aa $i
 done
 $TS_CMD_RENAME -s -v a x rename_a{a,b}/sublink.? >> $TS_OUTPUT 2>&1
-readlink rename_a{a,b}/sublink.?  >> $TS_OUTPUT 2>&1
+for i in rename_a{a,b}/sublink.?; do
+	readlink $i >> $TS_OUTPUT 2>&1
+done
 
 rm -rf rename_a{a,b}
 
-- 
2.0.3

Re: [PATCH 2/2] tests: fix rename subdir check that was failing in travis

[Bernhard Voelker]

On 07/30/2014 11:44 PM, Sami Kerola wrote:
> +readlink: extra operand `rename_aa/sublink.2'
> +Try `readlink --help' for more information.
> 
> The commit 0f85e0535bd4e6d19fadca182e4d57660b6bb57b introduced the travis
> realpath issue to happen.

s/realpath/readlink/
These are different programs. ;-)

Thanks & have a nice day,
Berny

Re: [PATCH 2/2] tests: fix rename subdir check that was failing in travis

[Sami Kerola]

On 31 July 2014 06:57, Bernhard Voelker <mail@bernhard-voelker.de> wrote:
> On 07/30/2014 11:44 PM, Sami Kerola wrote:
>> +readlink: extra operand `rename_aa/sublink.2'
>> +Try `readlink --help' for more information.
>>
>> The commit 0f85e0535bd4e6d19fadca182e4d57660b6bb57b introduced the travis
>> realpath issue to happen.
>
> s/realpath/readlink/
> These are different programs. ;-)

Hi Berny

They are indeed. Commit message is corrected in my git.

https://github.com/kerolasa/lelux-utiliteetit/commit/a009e86e8edc311b2cf3f8baea151d34c687527c

-- 
Sami Kerola
http://www.iki.fi/kerolasa/