← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/linux_swap.cc

  • Committer: Bazaar Package Importer
  • Author(s): Anibal Monsalve Salazar
  • Date: 2010-06-30 21:37:01 UTC
  • mfrom: (6.3.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20100630213701-mb46ic0orpuz7l6m
Tags: 0.6.0-1
* New upstream release 
* Fix out-of-date-standards-version

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/linux_swap.cc
80
80
                String::ucompose( _("create new %1 file system"), Utils::get_filesystem_string( FS_LINUX_SWAP ) ) ) ) ;
81
81
 
82
82
        //Maintain label and uuid when recreating swap
83
 
        Glib::ustring command = "mkswap -L \"" + partition_new .label + "\" -U \"" + partition_new .uuid + "\" " + partition_new .get_path() ;
 
83
        Glib::ustring command = "mkswap -L \"" + partition_new .label + "\" " ;
 
84
        if ( ! partition_new .uuid .empty() )
 
85
                command +=  " -U \"" + partition_new .uuid + "\" " ;
 
86
        command += partition_new .get_path() ;
84
87
        bool exit_status = ! execute_command( command , operationdetail .get_last_child() ) ;
85
88
 
86
89
        operationdetail .get_last_child() .set_status( exit_status ? STATUS_SUCCES : STATUS_ERROR ) ;