← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gparted/trusty

« back to all changes in this revision

Viewing changes to src/xfs.cc

  • Committer: Package Import Robot
  • Author(s): Phillip Susi
  • Date: 2012-01-23 18:39:56 UTC
  • mfrom: (6.3.19)
  • Revision ID: package-import@ubuntu.com-20120123183956-hgocehdv6vs3g0gi
Tags: 0.11.0-1
https://launchpad.net/bugs/614994
* Merge from 0.8.1-1ubuntu5: Run dh_translations during build,
  if available.
* New upstream release 

  GParted 0.11.0  (2011-12-13)

  Key changes include:
  - Display ext2/3/4, ntfs, and btrfs unicode volume labels properly
  - Add labelling of btrfs file systems
  - Enable XFS copy to new smaller partition

  Bug Fixes
  - Display ext2/3/4 unicode volume labels properly (#662537)
  - Display ntfs unicode volume labels properly
    LP: #614994
  - Fix FAT16/32 label displayed as uppercase (#625337)
  - Add labelling of btrfs file systems (#663207)
    Thanks to Mike Fleetwood for small patch
    Requires btrfs-tools package yet-to-be-released (> Oct 25, 2011)
  - Fix btrfs volume label reading (#663590)
    Thanks to Mike Fleetwood for small patch
  - Enable XFS copy to new smaller partition (#663806)
    Thanks to Stephen Kirkby for small reverse umount order patch
  - Use newer btrfs multi-tool control command first (#663884)
    Thanks to Mike Fleetwood for this patch
  - Avoid redundant file system maximize actions (#663980)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xfs.cc
295
295
                                                        operationdetail .get_last_child() .set_status( STATUS_ERROR ) ;
296
296
                                                }
297
297
                                                
298
 
                                                //unmount destination partition
 
298
                                                //unmount source partition
299
299
                                                operationdetail .add_child(
300
 
                                                        OperationDetail( String::ucompose( _("unmount %1"),
301
 
                                                                                            dest_part_path ) ) ) ;
 
300
                                                        OperationDetail( String::ucompose( _("unmount %1"), src_part_path ) ) ) ;
302
301
                                        
303
 
                                                if ( ! execute_command( "umount -v  " + dest_part_path,
 
302
                                                if ( ! execute_command( "umount -v  " + src_part_path,
304
303
                                                                        operationdetail .get_last_child() ) )
305
304
                                                {
306
305
                                                        operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;
316
315
                                                operationdetail .get_last_child() .set_status( STATUS_ERROR ) ;
317
316
                                        }
318
317
                                        
319
 
                                        //unmount source partition
 
318
                                        //unmount destination partition
320
319
                                        operationdetail .add_child(
321
 
                                                OperationDetail( String::ucompose( _("unmount %1"), src_part_path ) ) ) ;
 
320
                                                OperationDetail( String::ucompose( _("unmount %1"), dest_part_path ) ) ) ;
322
321
                                
323
 
                                        if ( ! execute_command( "umount -v  " + src_part_path,
 
322
                                        if ( ! execute_command( "umount -v  " + dest_part_path,
324
323
                                                                operationdetail .get_last_child() ) )
325
324
                                        {
326
325
                                                operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;