rpms/pybackpack/devel pybackpack-backupset-0.5.7.patch, NONE, 1.1 import.log, 1.2, 1.3 pybackpack.spec, 1.12, 1.13
Adam Miller
maxamillion at fedoraproject.org
Fri Dec 18 16:36:49 UTC 2009
Author: maxamillion
Update of /cvs/extras/rpms/pybackpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29775/devel
Modified Files:
import.log pybackpack.spec
Added Files:
pybackpack-backupset-0.5.7.patch
Log Message:
Patch to fix 538193
pybackpack-backupset-0.5.7.patch:
seteditor.glade | 25 +------------------------
seteditor.py | 40 +++++++++-------------------------------
2 files changed, 10 insertions(+), 55 deletions(-)
--- NEW FILE pybackpack-backupset-0.5.7.patch ---
Index: pybackpack/seteditor.py
===================================================================
--- pybackpack/seteditor.py (revision 237)
+++ pybackpack/seteditor.py (working copy)
@@ -4,11 +4,9 @@
import gtk.glade
import gobject
try:
- import nautilusburn
+ import braseromedia
except ImportError:
pass
-else:
- pass
import backupsets
import dialogs
@@ -48,6 +46,7 @@
self.widgets.get_widget('cmb_dst_type').set_active(0)
self.widgets.get_widget('notebook').set_current_page(0)
+ self.drive_sel = None
self.find_cd_burners()
def _new_column(self):
@@ -145,15 +144,7 @@
self.widgets.get_widget('entry_ssh_host').set_text(host)
self.widgets.get_widget('entry_ssh_path').set_text(path)
elif buset.dest[:7] == "cdrw://":
- device = buset.dest.replace("cdrw://", "")
self.widgets.get_widget('cmb_dst_type').set_active(1)
- found = False
- for row in self.widgets.get_widget('cmb_dst_burner').get_model():
- if row[1].get_device() == device:
- self.widgets.get_widget('cmb_dst_burner').set_active_iter(row.iter)
- found = True
- if not found:
- self.widgets.get_widget('cmb_dst_burner').set_active(0)
else:
self.widgets.get_widget('cmb_dst_type').set_active(0)
self.widgets.get_widget('entry_new_set_def_dest').set_text(buset.dest)
@@ -240,9 +231,9 @@
self.widgets.get_widget('druid_summary_dest').set_text("sftp://%s@%s%s" % (user, host, path))
elif self.widgets.get_widget('cmb_dst_type').get_active() == 1: # CD burner
- if self.widgets.get_widget('cmb_dst_burner').get_active() == -1:
+ if self.drive_sel is None:
return True
- dest = self.widgets.get_widget('cmb_dst_burner').get_model()[self.widgets.get_widget('cmb_dst_burner').get_active()][1].get_device()
+ dest = self.drive_sel.get_active().get_block_device()
self.widgets.get_widget('druid_summary_dest').set_text("cdrw://%s" % dest)
self.widgets.get_widget('chk_removable_device').set_active(True)
self.widgets.get_widget('druid_page_3').set_title(_("Add Files/Folders to '%s'") % self.widgets.get_widget('entry_new_set_name').get_text())
@@ -284,9 +275,6 @@
def filechosen_new_set_default_dest(self, filename):
self.widgets.get_widget('entry_new_set_def_dest').set_text(filename)
- def on_button_refresh_cd_burners_clicked(self, widget):
- self.find_cd_burners()
-
def on_druid_page_finish_prepare(self, widget, event):
event.set_buttons_sensitive(False, False, False, False)
@@ -365,26 +353,16 @@
""" Populate a combo box with the names of available CD/DVD drives """
try:
- nautilusburn
+ braseromedia
except NameError:
error_string = _("No CD burners available, because you do not have the python module \
-nautilusburn.")
+braseromedia.")
self.widgets.get_widget('lbl_cd_burner').set_text(error_string)
- self.widgets.get_widget('cmb_dst_burner').set_sensitive(False)
else:
- sel = nautilusburn.DriveSelection()
- self.widgets.get_widget('cmb_dst_burner').set_model(sel.get_model())
+ self.drive_sel = braseromedia.DriveSelection()
+ self.widgets.get_widget('hbox30').add(self.drive_sel)
+ self.drive_sel.show()
- if len(sel.get_model()) == 0:
- error_string = _("No CD burners were detected on your system.")
- self.widgets.get_widget('lbl_cd_burner').set_text(error_string)
- self.widgets.get_widget('cmb_dst_burner').set_sensitive(False)
- else:
- msg_string = _("Select which CD burner to use:")
- self.widgets.get_widget('lbl_cd_burner').set_text(msg_string)
- self.widgets.get_widget('cmb_dst_burner').set_active(0)
- self.widgets.get_widget('cmb_dst_burner').set_sensitive(True)
-
def on_hiddenfiles_toggled(self, event):
fc = self.widgets.get_widget('filechooserwidget1')
fc.set_show_hidden(event.get_active())
Index: pybackpack/seteditor.glade
===================================================================
--- pybackpack/seteditor.glade (revision 237)
+++ pybackpack/seteditor.glade (working copy)
@@ -438,31 +438,8 @@
<widget class="GtkHBox" id="hbox30">
<property name="visible">True</property>
<child>
- <widget class="GtkComboBox" id="cmb_dst_burner">
- <property name="visible">True</property>
- <property name="items" translatable="yes"></property>
- </widget>
+ <placeholder/>
</child>
- <child>
- <widget class="GtkButton" id="button2_refresh_cd_burners">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_button_refresh_cd_burners_clicked"/>
- <child>
- <widget class="GtkImage" id="image26">
- <property name="visible">True</property>
- <property name="stock">gtk-refresh</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
<packing>
<property name="fill">False</property>
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 26 Sep 2008 20:14:33 -0000 1.2
+++ import.log 18 Dec 2009 16:36:48 -0000 1.3
@@ -1,2 +1,3 @@
pybackpack-0_5_5-1_fc9:HEAD:pybackpack-0.5.5-1.fc9.src.rpm:1221005806
pybackpack-0_5_6-1_fc9:HEAD:pybackpack-0.5.6-1.fc9.src.rpm:1222459966
+pybackpack-0_5_7-2_fc12:HEAD:pybackpack-0.5.7-2.fc12.src.rpm:1261154163
Index: pybackpack.spec
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/devel/pybackpack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- pybackpack.spec 16 Dec 2009 20:27:18 -0000 1.12
+++ pybackpack.spec 18 Dec 2009 16:36:48 -0000 1.13
@@ -4,7 +4,7 @@
Summary: User oriented backup and restore application
Name: pybackpack
Version: 0.5.7
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: Applications/Archiving
URL: http://andrewprice.me.uk/projects/pybackpack/
@@ -25,12 +25,16 @@ Requires: gnome-python2-brasero
Requires: rdiff-backup >= 1.0
BuildArch: noarch
+Patch0: pybackpack-backupset-0.5.7.patch
+
%description
A GTK+ tool written in Python to backup files.
%prep
%setup -q
+%patch0 -p0
+
%build
python setup.py build
%install
More information about the fedora-extras-commits
mailing list