| Message ID | 1396971770-23553-1-git-send-email-lczerner@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue, Apr 8, 2014 at 4:42 PM, Lukas Czerner <lczerner@redhat.com> wrote: > With changes introduced in 667308dd97bf41382d4ab299fa5b56c235cfeb27 > it is no longer possible to use SCRATCH_DEV_POOL variable because of > error: > > common/config: Error: $SCRATCH_DEV should be unset when > $SCRATCH_DEV_POOL is set > > This was because get_next_config() would get called twice and hence it > would complain on the second run that SCRATCH_DEV is already set. Fix > it by making sure that we call get_next_config() only once if there > are no sections in the config file. > > Also make sure that we export SCRATCH_DEV in the case we're deducing it > from SCRATCH_DEV_POOL. > > Signed-off-by: Lukas Czerner <lczerner@redhat.com> > Reported-by: Filipe David Manana <fdmanana@gmail.com> Tested-by: Filipe David Manana <fdmanana@gmail.com> Tests working for btrfs now. Thanks Lukas. > --- > common/config | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/common/config b/common/config > index 4178c27..6fa18e2 100644 > --- a/common/config > +++ b/common/config > @@ -360,6 +360,10 @@ parse_config_section() { > } > > get_next_config() { > + if [ ! -z "$CONFIG_INCLUDED" ] && ! $OPTIONS_HAVE_SECTIONS; then > + return 0 > + fi > + > local OLD_FSTYP=$FSTYP > local OLD_MOUNT_OPTIONS=$MOUNT_OPTIONS > local OLD_MKFS_OPTIONS=$MKFS_OPTIONS > @@ -414,10 +418,11 @@ get_next_config() { > # to SCRATCH_DEV and rest to SCRATCH_DEV_POOL to maintain the backward compatibility > if [ ! -z "$SCRATCH_DEV_POOL" ]; then > if [ ! -z "$SCRATCH_DEV" ]; then > - echo "common/config: Error: \$SCRATCH_DEV should be unset when \$SCRATCH_DEV_POOL is set" > + echo "common/config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) should be unset when \$SCRATCH_DEV_POOL ($SCRATCH_DEV_POOL) is set" > exit 1 > fi > SCRATCH_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'` > + export SCRATCH_DEV > fi > > echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1 > -- > 1.8.3.1 >
diff --git a/common/config b/common/config index 4178c27..6fa18e2 100644 --- a/common/config +++ b/common/config @@ -360,6 +360,10 @@ parse_config_section() { } get_next_config() { + if [ ! -z "$CONFIG_INCLUDED" ] && ! $OPTIONS_HAVE_SECTIONS; then + return 0 + fi + local OLD_FSTYP=$FSTYP local OLD_MOUNT_OPTIONS=$MOUNT_OPTIONS local OLD_MKFS_OPTIONS=$MKFS_OPTIONS @@ -414,10 +418,11 @@ get_next_config() { # to SCRATCH_DEV and rest to SCRATCH_DEV_POOL to maintain the backward compatibility if [ ! -z "$SCRATCH_DEV_POOL" ]; then if [ ! -z "$SCRATCH_DEV" ]; then - echo "common/config: Error: \$SCRATCH_DEV should be unset when \$SCRATCH_DEV_POOL is set" + echo "common/config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) should be unset when \$SCRATCH_DEV_POOL ($SCRATCH_DEV_POOL) is set" exit 1 fi SCRATCH_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'` + export SCRATCH_DEV fi echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
With changes introduced in 667308dd97bf41382d4ab299fa5b56c235cfeb27 it is no longer possible to use SCRATCH_DEV_POOL variable because of error: common/config: Error: $SCRATCH_DEV should be unset when $SCRATCH_DEV_POOL is set This was because get_next_config() would get called twice and hence it would complain on the second run that SCRATCH_DEV is already set. Fix it by making sure that we call get_next_config() only once if there are no sections in the config file. Also make sure that we export SCRATCH_DEV in the case we're deducing it from SCRATCH_DEV_POOL. Signed-off-by: Lukas Czerner <lczerner@redhat.com> Reported-by: Filipe David Manana <fdmanana@gmail.com> --- common/config | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)