Merge lp:~sergiomeneses/testdrive/ubuntugnome-release into lp:testdrive

Proposed by Andres Rodriguez
Status: Merged
Merged at revision: 431
Proposed branch: lp:~sergiomeneses/testdrive/ubuntugnome-release
Merge into: lp:testdrive
Diff against target: 54 lines (+8/-1)
3 files modified
bin/testdrive (+1/-1)
bin/testdrive-gtk (+1/-0)
testdrivegtk/PreferencesTestdrivegtkDialog.py (+6/-0)
To merge this branch: bzr merge lp:~sergiomeneses/testdrive/ubuntugnome-release
Reviewer Review Type Date Requested Status
Andres Rodriguez Approve
Review via email: mp+192530@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

Looks good to me, just change the label

TAB_LABEL.append({"dist":"ubuntugnome", "label":"UbuntuGnome"})

to be 'Ubuntu Gnome'

Cheers.

review: Approve
432. By Sergio Meneses

tab for ubuntugnome isos

Revision history for this message
Sergio Meneses (sergiomeneses) wrote :

Ok! it's done. thanks for your help Andres.

Revision history for this message
Andres Rodriguez (andreserl) wrote :

Traceback (most recent call last):
  File "bin/testdrive-gtk", line 1002, in <module>
    window = TestdrivegtkWindow()
  File "bin/testdrive-gtk", line 115, in __new__
    new_object.finish_initializing(builder)
  File "bin/testdrive-gtk", line 141, in finish_initializing
    dlg = PreferencesTestdrivegtkDialog.PreferencesTestdrivegtkDialog()
  File "/home/roaksoax/Desktop/project/testdrive/testdrivegtk/PreferencesTestdrivegtkDialog.py", line 56, in __new__
    new_object.finish_initializing(builder, logger1)
  File "/home/roaksoax/Desktop/project/testdrive/testdrivegtk/PreferencesTestdrivegtkDialog.py", line 96, in finish_initializing
    self.initialize_widgets()
  File "/home/roaksoax/Desktop/project/testdrive/testdrivegtk/PreferencesTestdrivegtkDialog.py", line 203, in initialize_widgets
    self.chk_flavor_ubuntugnome.connect("clicked", self.on_select_flavors)
AttributeError: 'NoneType' object has no attribute 'connect'

review: Needs Fixing
Revision history for this message
Andres Rodriguez (andreserl) wrote :

UI changes seem missing in data/ui/PreferencesTestdrivegtkDialog.ui

Revision history for this message
Andres Rodriguez (andreserl) wrote :

I'll approve this but there was other fixes that needed to get done.

review: Approve
Revision history for this message
Bhavani Shankar (bhavi) wrote :

Hey,

When I try to run the testdrive-gtk with this branch I get:

bhavani@bhavani-Vostro1510:~/devel/ubuntugnome-release$ testdrive-gtk
Traceback (most recent call last):
  File "/usr/local/bin/testdrive-gtk", line 1002, in <module>
    window = TestdrivegtkWindow()
  File "/usr/local/bin/testdrive-gtk", line 113, in __new__
    builder = get_builder('TestdrivegtkWindow')
  File "/usr/local/lib/python2.7/dist-packages/testdrivegtk/helpers.py", line 44, in get_builder
    ui_filename = get_data_file('ui', '%s.ui' % (builder_file_name,))
  File "/usr/local/lib/python2.7/dist-packages/testdrivegtk/testdrivegtkconfig.py", line 54, in get_data_file
    return os.path.join(get_data_path(), *path_segments)
  File "/usr/local/lib/python2.7/dist-packages/testdrivegtk/testdrivegtkconfig.py", line 71, in get_data_path
    raise project_path_not_found
testdrivegtk.testdrivegtkconfig.project_path_not_found

Is there anything I'm missing here?

Regards
Bhavani

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/testdrive'
2--- bin/testdrive 2013-08-10 20:52:38 +0000
3+++ bin/testdrive 2013-10-24 15:57:18 +0000
4@@ -204,7 +204,7 @@
5 help=_('hardcode Ubuntu RELEASE codename'))
6 parser.add_option('-l', '--flavor', action='store', type='string', dest='flavor',
7 help=_('hardcode Ubuntu flavor. Available Flavors:\n\
8- ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/ubuntustudio/lubuntu/ubuntukylin'))
9+ ubuntu/kubuntu/xubuntu/edubuntu/mythbuntu/ubuntustudio/lubuntu/ubuntukylin/ubuntugnome'))
10 parser.add_option('-p', '--repo', action='store', type='string', dest='repository',
11 help=_('hardcode Ubuntu repository from where to obtain ISOs:\n\
12 releases/cdimage/cloud-daily/cloud-releases'))
13
14=== modified file 'bin/testdrive-gtk'
15--- bin/testdrive-gtk 2013-08-10 20:52:38 +0000
16+++ bin/testdrive-gtk 2013-10-24 15:57:18 +0000
17@@ -46,6 +46,7 @@
18 TAB_LABEL.append({"dist":"ubuntustudio", "label":"Ubuntu Studio"})
19 TAB_LABEL.append({"dist":"lubuntu", "label":"Lubuntu"})
20 TAB_LABEL.append({"dist":"ubuntukylin", "label":"UbuntuKylin"})
21+TAB_LABEL.append({"dist":"ubuntugnome", "label":"Ubuntu Gnome"})
22 TAB_LABEL.append({"dist":"other", "label":_("Other")})
23
24 global ISOLIST
25
26=== modified file 'testdrivegtk/PreferencesTestdrivegtkDialog.py'
27--- testdrivegtk/PreferencesTestdrivegtkDialog.py 2013-08-10 21:31:38 +0000
28+++ testdrivegtk/PreferencesTestdrivegtkDialog.py 2013-10-24 15:57:18 +0000
29@@ -199,6 +199,8 @@
30 self.chk_flavor_lubuntu.connect("clicked", self.on_select_flavors)
31 self.chk_flavor_ubuntukylin = self.builder.get_object("chk_flavor_ubuntukylin")
32 self.chk_flavor_ubuntukylin.connect("clicked", self.on_select_flavors)
33+ self.chk_flavor_ubuntugnome = self.builder.get_object("chk_flavor_ubuntugnome")
34+ self.chk_flavor_ubuntugnome.connect("clicked", self.on_select_flavors)
35 self.chk_flavor_other = self.builder.get_object("chk_flavor_other")
36 self.chk_flavor_other.connect("clicked", self.on_select_flavors)
37
38@@ -302,6 +304,8 @@
39 self.chk_flavor_lubuntu.set_active(True)
40 elif flavor == 'ubuntukylin':
41 self.chk_flavor_ubuntukylin.set_active(True)
42+ elif flavor == 'ubuntugnome':
43+ self.chk_flavor_ubuntugnome.set_active(True)
44 elif flavor == 'other':
45 self.chk_flavor_other.set_active(True)
46 else:
47@@ -447,6 +451,8 @@
48 self.flavors = self.flavors + "lubuntu, "
49 if self.chk_flavor_ubuntukylin.get_active():
50 self.flavors = self.flavors + "ubuntukylin, "
51+ if self.chk_flavor_ubuntugnome.get_active():
52+ self.flavors = self.flavors + "ubuntugnome, "
53 if self.chk_flavor_other.get_active():
54 self.flavors = self.flavors + "other, "
55

Subscribers

People subscribed via source and target branches