This email list is read-only. Emails sent to this list will be discarded
----------------------------------
debian/changelog | 8 +++-
gui/gui.py | 88 ++++++++++++++++++++++++++++++++-------------
moblin-image-creator.spec | 28 ++++++++++++++
3 files changed, 97 insertions(+), 27 deletions(-)
New commits:
commit bd914a55717648440b35a6c1591c2e9baa47bab7
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Thu Nov 27 18:25:18 2008 +0900
Following Prajwal's changelog.
commit cf7ac0ae68272b3edf4c264c7b019194a1cde88a
Merge: 26dfd5275b80e65c6e2941b89de29f87acc11303
4219436ac8f346448bdaddb013227d9f93ee58bb
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Thu Nov 27 18:13:38 2008 +0900
Merge branch 'master' of ssh://[EMAIL
PROTECTED]/home/repos/tools/moblin-image-creator
Conflicts:
debian/changelog
commit 26dfd5275b80e65c6e2941b89de29f87acc11303
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Thu Nov 27 18:12:17 2008 +0900
Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=130
Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index 9131114..07ec64c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,9 +19,13 @@ moblin-image-creator (0.48) gaston; urgency=low
* Changing USB script to accomodate booting through KVM/QEMU
* Fixing bugs with yum group install
* Changing fsets
- * Fixing usb script
+ * Fixing usb script
+
+ [ Mitsutaka Amano ]
+ * Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=130
+ * Following Prajwal's changelog.
- -- Prajwal Mohan <[EMAIL PROTECTED]> Wed, 26 Nov 2008 11:20:55 -0800
+ -- Mitsutaka Amano <[EMAIL PROTECTED]> Thu, 27 Nov 2008 18:24:27 +0900
moblin-image-creator (0.47) gaston; urgency=low
diff --git a/gui/gui.py b/gui/gui.py
index 7980919..80cbb1a 100644
--- a/gui/gui.py
+++ b/gui/gui.py
@@ -329,23 +329,26 @@ class App(object):
column.set_sort_column_id(id)
self.targetView.append_column(column)
- def stop_progress(self, widget, cancelData):
- #self.stopTest = True
+ def stop_progress(self, widget, cancelData):
+ cur_pid = os.getpid()
+ child_list = pdk_utils.findChildren(cur_pid)
+ for child in child_list:
+ print child
tree = gtk.glade.XML(self.gladefile, 'qDialog')
- tree.get_widget('queryLabel').set_text(_("Are you sure you want to
cancel project creation?"))
+ tree.get_widget('queryLabel').set_text(cancelData[0])
tree.get_widget('cancelbutton2').set_label("gtk-no")
tree.get_widget('okbutton2').set_label("gtk-yes")
dialog = tree.get_widget('qDialog')
result = dialog.run()
- dialog.destroy()
+ dialog.destroy()
if result == gtk.RESPONSE_OK:
cur_pid = os.getpid()
child_list = pdk_utils.findChildren(cur_pid)
for child in child_list:
+ print child
if child != cur_pid:
os.kill(child, signal.SIGKILL)
- print _("Canceled Function was %s and cancel type was %s") %
(cancelData[0], cancelData[1])
-
+ print _("Canceled Function was %s and cancel type was %s") %
(cancelData[1], cancelData[2])
def on_new_project_clicked(self, widget):
"""Instantiate a new dialogue"""
@@ -392,8 +395,8 @@ class App(object):
self.statuslabel = progress_tree.get_widget('status_label')
self.progressCancel =
progress_tree.get_widget('progressCancel')
self.progressCancel.set_sensitive(True)
- cancelData = ("AddProject", "Hard")
- self.progressCancel.connect("clicked", self.stop_progress,
cancelData)
+ cancelData = (_("Are you sure you want to cancel project
creation?"), "AddProject", "Hard")
+ self.progressCancel.connect("clicked", self.stop_progress,
cancelData)
while gtk.events_pending():
gtk.main_iteration(False)
platformName = dialog.platform.split()[0]
@@ -419,7 +422,6 @@ class App(object):
pass
return
self.projectList.append((dialog.name, dialog.desc,
dialog.path, platformName))
-
progress_dialog.destroy()
if target_name != None:
mic_cmd = 'image-creator --command=create-target
--project-name=\'' + dialog.name + '\' --target-name=\'' + target_name + '\''
@@ -525,16 +527,29 @@ class App(object):
progress_dialog.connect('delete_event', self.ignore)
progress_tree.get_widget('progress_label').set_text(_("Please wait
while creating %s") % target_name)
self.progressbar = progress_tree.get_widget('progressbar')
+ self.statuslabel = progress_tree.get_widget('status_label')
+ self.progressCancel = progress_tree.get_widget('progressCancel')
+ self.progressCancel.set_sensitive(True)
+ cancelData = (_("Are you sure you want to cancel target creation?"),
"AddTarget", "Hard")
+ self.progressCancel.connect("clicked", self.stop_progress, cancelData)
while gtk.events_pending():
gtk.main_iteration(False)
- if mic_cfg.config.get('general', 'use_rootstraps') == '1':
- project.create_target(target_name)
- else:
- project.create_target(target_name, False)
+ try:
+ if mic_cfg.config.get('general', 'use_rootstraps') == '1':
+ project.create_target(target_name)
+ else:
+ project.create_target(target_name, False)
+ except:
+ print _("Target Creation cancelled")
+ try:
+ project.delete_target(target_name)
+ except:
+ # if the project creation failed before the list of
+ # projects has been updated, then we expect failure here
+ pass
self.redraw_target_view()
progress_dialog.destroy()
-
def checkBoxCallback(self, widget, fSetName):
"""Call back function when the check box is clicked. This function
calculates all dependencies of fsets and checks the rest of the boxes"""
#platform = self.current_project().platform
@@ -1395,25 +1410,48 @@ class App(object):
progress_dialog.connect('delete_event', self.ignore)
progress_tree.get_widget('progress_label').set_text(_("Please wait
while upgrading Project"))
self.progressbar = progress_tree.get_widget('progressbar')
- mic_cmd='image-creator --command=update-project --project-name=\'' +
self.current_project().name + '\''
- self.append_cmd_list(mic_cmd)
- result = self.current_project().updateAndUpgrade()
- if result != 0:
- raise OSError(_("Internal error while attempting to run
update/upgrade: %s") % result)
+ self.statuslabel = progress_tree.get_widget('status_label')
+ self.progressCancel = progress_tree.get_widget('progressCancel')
+ self.progressCancel.set_sensitive(True)
+ cancelData = (_("Are you sure you want to cancel project update?"),
"UpgradeProject", "Hard")
+ self.progressCancel.connect("clicked", self.stop_progress, cancelData)
+ while gtk.events_pending():
+ gtk.main_iteration(False)
+ try:
+ mic_cmd='image-creator --command=update-project --project-name=\''
+ self.current_project().name + '\''
+ self.append_cmd_list(mic_cmd)
+ result = self.current_project().updateAndUpgrade()
+ if result != 0:
+ raise OSError(_("Internal error while attempting to run
update/upgrade: %s") % result)
+ except:
+ print _("Project update cancelled")
+ progress_dialog.destroy()
+ return
progress_dialog.destroy()
-
def on_upgrade_target_clicked(self, widget):
progress_tree = gtk.glade.XML(self.gladefile, 'ProgressDialog')
progress_dialog = progress_tree.get_widget('ProgressDialog')
progress_dialog.connect('delete_event', self.ignore)
progress_tree.get_widget('progress_label').set_text(_("Please wait
while upgrading Target"))
self.progressbar = progress_tree.get_widget('progressbar')
- mic_cmd='image-creator --command=update-target --project-name=\'' +
self.current_project().name + '\' --target-name=\'' +
self.current_target().name + '\''
- self.append_cmd_list(mic_cmd)
- result = self.current_target().updateAndUpgrade()
- if result != 0:
- raise OSError(_("Internal error while attempting to run
update/upgrade: %s") % result)
+ self.statuslabel = progress_tree.get_widget('status_label')
+ self.progressCancel = progress_tree.get_widget('progressCancel')
+ self.progressCancel.set_sensitive(True)
+ cancelData = (_("Are you sure you want to cancel target update?"),
"UpgradeTarget", "Hard")
+ self.progressCancel.connect("clicked", self.stop_progress, cancelData)
+ while gtk.events_pending():
+ gtk.main_iteration(False)
+ try:
+ mic_cmd='image-creator --command=update-target --project-name=\''
+ self.current_project().name + '\' --target-name=\'' +
self.current_target().name + '\''
+ self.append_cmd_list(mic_cmd)
+ result = self.current_target().updateAndUpgrade()
+ if result != 0:
+ raise OSError(_("Internal error while attempting to run
update/upgrade: %s") % result)
+ except:
+ print _("Target update cancelled")
+ progress_dialog.destroy()
+ return
progress_dialog.destroy()
self.redraw_target_view()
diff --git a/moblin-image-creator.spec b/moblin-image-creator.spec
index cdce537..c171b0d 100644
--- a/moblin-image-creator.spec
+++ b/moblin-image-creator.spec
@@ -61,6 +61,34 @@ rm -rf %{buildroot}
/var/lib/moblin-image-creator/projects
%changelog
+* Mon Nov 27 2008 Mitsutaka Amano <[EMAIL PROTECTED]>
+- Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=130
+- Following Prajwal's changelog.
+
+* Wed Nov 26 2008 Prajwal Mohan <[EMAIL PROTECTED]>
+- Changing fsets
+- Fixing usb script
+
+* Tue Nov 25 2008 Prajwal Mohan <[EMAIL PROTECTED]>
+- Fixing bugs with yum group install
+- Changing fsets
+
+* Mon Nov 24 2008 Prajwal Mohan <[EMAIL PROTECTED]>
+- Changing USB script to accomodate boothing through KVM/QEMU
+- Fixing bugs with yum group install
+
+* Fri Nov 21 2008 Prajwal Mohan <[EMAIL PROTECTED]>
+- Should be using bzImage for nand and not vmlinuz
+- Adding command line options to add repos to yum targets
+- Adding command line options to add repos to yum targets
+- Changing Nand cmd line
+
+* Thu Nov 19 2008 Prajwal Mohan <[EMAIL PROTECTED]>
+- Adding mount in install script
+
+* Thu Nov 13 2008 Prajwal Mohan <[EMAIL PROTECTED]>
+- Adding update column for target view
+
* Mon Nov 10 2008 Mitsutaka Amano <[EMAIL PROTECTED]>
- Updated ja.po.
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
