[Parted-commits] GNU Parted Official Repository: Changes to 'master'

[Jim Meyering]

 configure.ac    |    2 +-
 doc/parted.texi |    2 +-
 parted/parted.c |    8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 023b538f57bbbaa435ec21eee29e688a2bb54199
Author: Petr Uzel <petr.uzel at suse.cz>
Date:   Fri May 28 17:11:05 2010 +0200

    doc: fix a typo
    
    * doc/parted.texi: s/onstraints/constraints/

diff --git a/doc/parted.texi b/doc/parted.texi
index 08cf2dc..4e0fec9 100644
--- a/doc/parted.texi
+++ b/doc/parted.texi
@@ -1164,7 +1164,7 @@ and will select the nearest location in this range from the one you
 wrote that satisfies constraints from both the operation, the
 filesystem being worked on, the disk label, other partitions and so
 on.  Use the sector unit ``s'' to specify exact locations (if they
-do not satisfy all onstraints, Parted will ask you for the nearest
+do not satisfy all constraints, Parted will ask you for the nearest
 solution).  Note that negative numbers count back from the end of
 the disk, with ``-1s'' pointing to the end of the disk.
 

commit c8b2f218c7a9a5b9bb416b21dfe561653cd7d8c1
Author: Petr Uzel <petr.uzel at suse.cz>
Date:   Fri May 28 16:42:20 2010 +0200

    parted: do_align_check returns always 1 in interactive mode
    
    * parted/parted.c (do_align_check): Always return 1 in interactive mode.

diff --git a/parted/parted.c b/parted/parted.c
index 7723d18..265282a 100644
--- a/parted/parted.c
+++ b/parted/parted.c
@@ -2094,8 +2094,12 @@ do_align_check (PedDevice **dev)
 
   ped_disk_destroy (disk);
 
-  /* FIXME: perhaps we should always return 1 when in interactive mode???  */
-  return aligned ? 1 : 0;
+  if (opt_script_mode)
+    return aligned ? 1 : 0;
+
+  /* Always return 1 in interactive mode, to be consistent
+     with the other modes.  */
+  return 1;
 
 error_destroy_disk:
   ped_disk_destroy (disk);

commit 1a758cf451967f1799b14fcef96a1a8a8c217beb
Author: Jim Meyering <meyering at redhat.com>
Date:   Thu May 27 16:32:34 2010 +0200

    build: really use gettext-0.17
    
    * configure.ac: Correct previous change to use 0.17, not 0.18,
    since gettext-0.18 is new enough that it makes building from git
    a little too inconvenient.  Spotted by Petr Uzel.

diff --git a/configure.ac b/configure.ac
index 9ae5783..a994d09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -295,7 +295,7 @@ libraries.)
 fi
 AM_PROG_LIBTOOL
 
-AM_GNU_GETTEXT_VERSION([0.18])
+AM_GNU_GETTEXT_VERSION([0.17])
 AM_GNU_GETTEXT([external])
 if test "$USE_INCLUDED_LIBINTL" = "yes"; then
 	AC_MSG_ERROR([