pool/parted
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update make-align-check-work-in-interactive-mode.patch to

Browse Source 
be consistent with upstream

OBS-URL: https://build.opensuse.org/package/show/Base:System/parted?expand=0&rev=24
This commit is contained in:
Petr Uzel 2010-06-30 11:16:41 +00:00 committed by Git OBS Bridge
parent 99d0a5e346
commit b73834259b
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
make-align-check-work-in-interactive-mode.patch
View File

@ -1,8 +1,8 @@
Index: parted-2.2/parted/parted.c 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.orig/parted/parted.c 2010-06-30 13:10:27.000000000 +0200
+++ parted-2.2/parted/parted.c 2010-05-27 17:35:27.000000000 +0200 +++ parted-2.2/parted/parted.c 2010-06-30 13:11:09.000000000 +0200
@@ -2135,18 +2135,29 @@ do_align_check (PedDevice **dev) @@ -2135,18 +2135,33 @@ do_align_check (PedDevice **dev)
{ {
PedDisk *disk = ped_disk_new (*dev); PedDisk *disk = ped_disk_new (*dev);
if (!disk) if (!disk)
@ -28,9 +28,13 @@ Index: parted-2.2/parted/parted.c
ped_disk_destroy (disk); ped_disk_destroy (disk);
+ /* FIXME: perhaps we should always return 1 when in interactive mode??? */ + if (opt_script_mode)
return aligned ? 1 : 0; return aligned ? 1 : 0;
+ +
+ /* Always return 1 in interactive mode, to be consistent
+ with the other modes. */
+ return 1;
+
+error_destroy_disk: +error_destroy_disk:
+ ped_disk_destroy (disk); + ped_disk_destroy (disk);
+error: +error:

6
parted.changes
View File

@ -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 Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de