Attachment 6593 Details for Bug 15990 – kill-uefi-mode.diff

[patch] kill-uefi-mode.diff

kill-uefi-mode.diff (text/plain), 4.62 KB, created by claire robinson on 2015-05-20 15:53:04 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: claire robinson

Created: 2015-05-20 15:53:04 CEST

Size: 4.62 KB

patch

obsolete

>diff -up ./lib/isodumper.py.tv ./lib/isodumper.py
>--- ./lib/isodumper.py.tv	2015-05-20 08:56:33.410071900 -0400
>+++ ./lib/isodumper.py	2015-05-20 08:57:36.018332100 -0400
>@@ -485,61 +485,8 @@ class IsoDumper:
>                 self.do_umount(target)
>                 dialog.hide()
>                 # Writing step
>-                # Iso dump or Uefi preparation
>-                uefi_checkbox=self.wTree.get_widget("uefi_check")
>-                if uefi_checkbox.get_active():
>-                    #uefi mode : formats FAT32, names MGALIVE, copies the ISO
>-                    target = self.dev.split('(')[1].split(')')[0]
>-                    dev_name="MGALIVE"
>-                    rc=self.raw_format(target, 'fat32', dev_name)
>-                    if rc == 5:
>-                        message = _("An error occurred while creating a partition.")
>-                        self.logger(message)
>-                        self.emergency()
>-                    elif rc == 127:
>-                        message = _('Authentication error.')
>-                        self.logger(message)
>-                        self.emergency()
>-                    elif rc == 0:
>-                        message = _('The device was formatted successfully.')
>-                        self.logger(message)
>-#                        time.sleep(2)
>-                        seen=False
>-                        part=target+'1'
>-                        while(not seen):
>-                            try:
>-                                self.u.device(part)
>-                                seen=True
>-                            except:
>-                                seen=False
>-                                time.sleep(.5)
>-                        try:
>-                            dest=self.u.mount(part)
>-                        except:
>-                            self.logger(_("Error mounting the partition %s")%part)
>-                            self.emergency()
>-                            return
>-                        if dest!="":
>-                            self.logger(_("Mounted in: ")+dest)
>-                            self.returncode=0
>-                            task = self.files_write(source, dest, b)
>-                            gobject.idle_add(task.next)
>-                            self.operation=False
>-                            while gtk.events_pending():
>-                                gtk.main_iteration(True)
>-                            if self.returncode==0:
>-                                self.success()
>-                            else:
>-                                self.logger(_("Error copying files"))
>-                                self.emergency()
>-                        else:
>-                            self.operation=False
>-                            self.logger(_("Error mounting the partition %s")%part)
>-                            self.emergency()
>-                    else:
>-                        message = _('An error occurred.')
>-                        self.emergency()
>-                else:
>+                # Iso dump
>+                if True:
>                     #Dump mode
>                     self.returncode=0
>                     b=os.path.getsize(source)
>diff -up ./share/isodumper/isodumper.glade.tv ./share/isodumper/isodumper.glade
>--- ./share/isodumper/isodumper.glade.tv	2015-05-20 08:56:26.942425200 -0400
>+++ ./share/isodumper/isodumper.glade	2015-05-20 09:15:19.551079400 -0400
>@@ -1093,21 +1093,6 @@ The fields of the main window are as fol
>                       </packing>
>                     </child>
>                     <child>
>-                      <widget class="GtkCheckButton" id="uefi_check">
>-                        <property name="label" translatable="yes">For UEFI boot</property>
>-                        <property name="visible">True</property>
>-                        <property name="can_focus">True</property>
>-                        <property name="receives_default">False</property>
>-                        <property name="tooltip" translatable="yes">Use FAT32 format with MGALIVE as volume name.</property>
>-                        <property name="draw_indicator">True</property>
>-                      </widget>
>-                      <packing>
>-                        <property name="expand">True</property>
>-                        <property name="fill">True</property>
>-                        <property name="position">2</property>
>-                      </packing>
>-                    </child>
>-                    <child>
>                       <widget class="GtkButton" id="write_button">
>                         <property name="visible">True</property>
>                         <property name="sensitive">False</property>

diff -up ./lib/isodumper.py.tv ./lib/isodumper.py
--- ./lib/isodumper.py.tv	2015-05-20 08:56:33.410071900 -0400
+++ ./lib/isodumper.py	2015-05-20 08:57:36.018332100 -0400
@@ -485,61 +485,8 @@ class IsoDumper:
                 self.do_umount(target)
                 dialog.hide()
                 # Writing step
-                # Iso dump or Uefi preparation
-                uefi_checkbox=self.wTree.get_widget("uefi_check")
-                if uefi_checkbox.get_active():
-                    #uefi mode : formats FAT32, names MGALIVE, copies the ISO
-                    target = self.dev.split('(')[1].split(')')[0]
-                    dev_name="MGALIVE"
-                    rc=self.raw_format(target, 'fat32', dev_name)
-                    if rc == 5:
-                        message = _("An error occurred while creating a partition.")
-                        self.logger(message)
-                        self.emergency()
-                    elif rc == 127:
-                        message = _('Authentication error.')
-                        self.logger(message)
-                        self.emergency()
-                    elif rc == 0:
-                        message = _('The device was formatted successfully.')
-                        self.logger(message)
-#                        time.sleep(2)
-                        seen=False
-                        part=target+'1'
-                        while(not seen):
-                            try:
-                                self.u.device(part)
-                                seen=True
-                            except:
-                                seen=False
-                                time.sleep(.5)
-                        try:
-                            dest=self.u.mount(part)
-                        except:
-                            self.logger(_("Error mounting the partition %s")%part)
-                            self.emergency()
-                            return
-                        if dest!="":
-                            self.logger(_("Mounted in: ")+dest)
-                            self.returncode=0
-                            task = self.files_write(source, dest, b)
-                            gobject.idle_add(task.next)
-                            self.operation=False
-                            while gtk.events_pending():
-                                gtk.main_iteration(True)
-                            if self.returncode==0:
-                                self.success()
-                            else:
-                                self.logger(_("Error copying files"))
-                                self.emergency()
-                        else:
-                            self.operation=False
-                            self.logger(_("Error mounting the partition %s")%part)
-                            self.emergency()
-                    else:
-                        message = _('An error occurred.')
-                        self.emergency()
-                else:
+                # Iso dump
+                if True:
                     #Dump mode
                     self.returncode=0
                     b=os.path.getsize(source)
diff -up ./share/isodumper/isodumper.glade.tv ./share/isodumper/isodumper.glade
--- ./share/isodumper/isodumper.glade.tv	2015-05-20 08:56:26.942425200 -0400
+++ ./share/isodumper/isodumper.glade	2015-05-20 09:15:19.551079400 -0400
@@ -1093,21 +1093,6 @@ The fields of the main window are as fol
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="uefi_check">
-                        <property name="label" translatable="yes">For UEFI boot</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip" translatable="yes">Use FAT32 format with MGALIVE as volume name.</property>
-                        <property name="draw_indicator">True</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
                       <widget class="GtkButton" id="write_button">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>

Actions: View | Diff

Attachments on bug 15990: 6593