From b73834259b9f5e9e82ffad8dc5bbb2a08fcb9fcdf06c368f89adecd685bea211 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Wed, 30 Jun 2010 11:16:41 +0000 Subject: [PATCH] - update make-align-check-work-in-interactive-mode.patch to be consistent with upstream OBS-URL: https://build.opensuse.org/package/show/Base:System/parted?expand=0&rev=24 --- make-align-check-work-in-interactive-mode.patch | 12 ++++++++---- parted.changes | 6 ++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/make-align-check-work-in-interactive-mode.patch b/make-align-check-work-in-interactive-mode.patch index 11daf15..466cfe1 100644 --- a/make-align-check-work-in-interactive-mode.patch +++ b/make-align-check-work-in-interactive-mode.patch @@ -1,8 +1,8 @@ Index: parted-2.2/parted/parted.c =================================================================== ---- parted-2.2.orig/parted/parted.c 2010-05-27 17:34:55.000000000 +0200 -+++ parted-2.2/parted/parted.c 2010-05-27 17:35:27.000000000 +0200 -@@ -2135,18 +2135,29 @@ do_align_check (PedDevice **dev) +--- parted-2.2.orig/parted/parted.c 2010-06-30 13:10:27.000000000 +0200 ++++ parted-2.2/parted/parted.c 2010-06-30 13:11:09.000000000 +0200 +@@ -2135,18 +2135,33 @@ do_align_check (PedDevice **dev) { PedDisk *disk = ped_disk_new (*dev); if (!disk) @@ -28,9 +28,13 @@ Index: parted-2.2/parted/parted.c ped_disk_destroy (disk); -+ /* FIXME: perhaps we should always return 1 when in interactive mode??? */ ++ 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); +error: diff --git a/parted.changes b/parted.changes index 1fddcb1..9aa8040 100644 --- a/parted.changes +++ b/parted.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 30 11:12:03 UTC 2010 - puzel@novell.com + +- update make-align-check-work-in-interactive-mode.patch to + be consistent with upstream + ------------------------------------------------------------------- Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de