diff -Nru cubic-2019.03-190/debian/bzr-builder.manifest cubic-2019.03-191/debian/bzr-builder.manifest --- cubic-2019.03-190/debian/bzr-builder.manifest 2019-03-17 05:01:45.000000000 +0000 +++ cubic-2019.03-191/debian/bzr-builder.manifest 2019-03-21 02:31:52.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.4 deb-version 2019.03-190-development~201903170501 -lp:cubic revid:psingh.cubic@gmail.com-20190317033052-pt2f6okmmhaxo1kz +# bzr-builder format 0.4 deb-version 2019.03-191-development~201903210231 +lp:cubic revid:psingh.cubic@gmail.com-20190321022651-c1hib0zwt6vf7ar4 diff -Nru cubic-2019.03-190/debian/changelog cubic-2019.03-191/debian/changelog --- cubic-2019.03-190/debian/changelog 2019-03-17 05:01:45.000000000 +0000 +++ cubic-2019.03-191/debian/changelog 2019-03-21 02:31:52.000000000 +0000 @@ -1,11 +1,21 @@ -cubic (2019.03-190-development~201903170501~ubuntu16.04.1) xenial; urgency=low +cubic (2019.03-191-development~201903210231~ubuntu16.04.1) xenial; urgency=low * Auto build. - -- Cubic PPA Sun, 17 Mar 2019 05:01:45 +0000 + -- Cubic PPA Thu, 21 Mar 2019 02:31:52 +0000 cubic (2019.03) cosmic; urgency=low + * Fixed Bug #1821116, Sometimes Cubic does not transition to repackage ISO + page when the Generate button is clicked. + + * Fixed Bug #1821117, Cubic tries to load boot configuration files even if + they do not exist. + + * Updated Cancel and Quit buttons to use the theme's destructive-action color. + + * The following changes were included in release revision 49... + * Fixed Bug #1820438, Allow Cubic to create ISOs larger than 4GB. The maximum ISO size is now 8TB. @@ -76,4 +86,4 @@ * Fixed Bug #1818597 Cubic crashes before displaying the Manage Options page. (This bug affected trunk version 2019.03-184-development only). - -- PJ Singh Sat, 16 Mar 2019 23:22:17 -0400 + -- PJ Singh Wed, 20 Mar 2019 22:23:48 -0400 diff -Nru cubic-2019.03-190/usr/share/cubic/cubic_gtk310.ui cubic-2019.03-191/usr/share/cubic/cubic_gtk310.ui --- cubic-2019.03-190/usr/share/cubic/cubic_gtk310.ui 2019-03-17 05:01:45.000000000 +0000 +++ cubic-2019.03-191/usr/share/cubic/cubic_gtk310.ui 2019-03-21 02:31:52.000000000 +0000 @@ -196,6 +196,9 @@ True True + True @@ -210,6 +213,9 @@ True True + True @@ -260,6 +266,9 @@ True True + True @@ -274,6 +283,9 @@ True True + True @@ -322,6 +334,9 @@ True True + True @@ -336,6 +351,9 @@ True True + True @@ -386,6 +404,9 @@ True True + True @@ -400,6 +421,9 @@ True True + True @@ -448,6 +472,9 @@ True True + True @@ -462,6 +489,9 @@ True True + True @@ -514,7 +544,7 @@ - 720 + 726 648 True False @@ -624,7 +654,7 @@ - 720 + 726 648 False center @@ -1233,7 +1263,7 @@ - 720 + 726 648 False center @@ -1273,7 +1303,6 @@ True True False - 12 True True @@ -1902,7 +1931,7 @@ - 720 + 726 648 False center @@ -2352,7 +2381,7 @@ - 720 + 726 648 False center @@ -2603,7 +2632,7 @@ - 720 + 726 648 False 1 @@ -2690,7 +2719,7 @@ - 720 + 726 648 False center @@ -2807,9 +2836,12 @@ - 720 + 726 648 False + 1 + 1 + 1 True 0 @@ -2875,7 +2907,7 @@ True True center - 6 + 6 revert__image none @@ -2895,7 +2927,7 @@ True True center - 6 + 6 undo__image none @@ -2915,7 +2947,7 @@ True True center - 6 + 6 redo__image none @@ -2929,7 +2961,7 @@ - + True True True @@ -3058,7 +3090,7 @@ - + True True True @@ -3301,18 +3333,16 @@ - 500 True False - start center 18 18 18 18 True - 12 - 18 + 6 + 12 True @@ -3394,18 +3424,15 @@ - 500 - True False - start center 18 18 18 18 True - 12 - 18 + 6 + 12 True @@ -3600,7 +3627,7 @@ - 720 + 726 648 False center @@ -4216,7 +4243,7 @@ - 720 + 726 648 False center @@ -4565,6 +4592,9 @@ True True + 0 diff -Nru cubic-2019.03-190/usr/share/cubic/cubic_gtk318.ui cubic-2019.03-191/usr/share/cubic/cubic_gtk318.ui --- cubic-2019.03-190/usr/share/cubic/cubic_gtk318.ui 2019-03-17 05:01:45.000000000 +0000 +++ cubic-2019.03-191/usr/share/cubic/cubic_gtk318.ui 2019-03-21 02:31:52.000000000 +0000 @@ -194,7 +194,7 @@ True @@ -273,7 +273,7 @@ True @@ -350,7 +350,7 @@ True @@ -429,7 +429,7 @@ True @@ -506,7 +506,7 @@ True @@ -578,6 +578,9 @@ True True + @@ -637,8 +640,8 @@ - 720 - 720 + 726 + 726 True False center @@ -747,8 +750,8 @@ - 720 - 720 + 726 + 726 False center True @@ -1356,8 +1359,8 @@ - 720 - 720 + 726 + 726 False center True @@ -1396,7 +1399,6 @@ True True False - 12 True True @@ -2025,8 +2027,8 @@ - 720 - 720 + 726 + 726 False center True @@ -2475,8 +2477,8 @@ - 720 - 720 + 726 + 726 False center True @@ -2726,8 +2728,8 @@ - 720 - 720 + 726 + 726 False 1 1 @@ -2813,8 +2815,8 @@ - 720 - 720 + 726 + 726 False center True @@ -2930,9 +2932,12 @@ - 720 - 720 + 726 + 726 False + 1 + 1 + 1 True 0 @@ -2997,7 +3002,7 @@ True True center - 6 + 6 revert__image none @@ -3017,7 +3022,7 @@ True True center - 6 + 6 undo__image none @@ -3037,7 +3042,7 @@ True True center - 6 + 6 redo__image none @@ -3051,7 +3056,7 @@ - + True True True @@ -3180,7 +3185,7 @@ - + True True True @@ -3421,18 +3426,16 @@ - 500 True False - start center 18 18 18 18 True - 12 - 18 + 6 + 12 True @@ -3514,18 +3517,15 @@ - 500 - True False - start center 18 18 18 18 True - 12 - 18 + 6 + 12 True @@ -3719,8 +3719,8 @@ - 720 - 720 + 726 + 726 False center True @@ -4335,8 +4335,8 @@ - 720 - 720 + 726 + 726 False center True diff -Nru cubic-2019.03-190/usr/share/cubic/display.py cubic-2019.03-191/usr/share/cubic/display.py --- cubic-2019.03-190/usr/share/cubic/display.py 2019-03-17 05:01:45.000000000 +0000 +++ cubic-2019.03-191/usr/share/cubic/display.py 2019-03-21 02:31:52.000000000 +0000 @@ -640,42 +640,49 @@ # Add new items to the stack. logger.log_data('Add new items to stack', stack_name) for filepath in filepaths: + title = '/%s' % os.path.relpath( filepath, model.custom_live_iso_directory) - logger.log_data('Add %s from filepath' % title, filepath) - # Create a new scrolled window. - builder_temp = Gtk.Builder.new_from_file('scrolled_window.ui') - scrolled_window = builder_temp.get_object('scrolled_window') - - # Get the source buffer. - source_view = scrolled_window.get_child() - source_buffer = source_view.get_buffer() - - # Read the file, and add it to the source buffer. - with open(filepath, 'r') as file: - data = file.read() - source_buffer.set_text(data) - - # Add the new scrolled window to the stack. - stack.add_titled(scrolled_window, filepath, title) - - # Optionally replace text. - for search_replace_tuple in search_replace_tuples: - search_text, replacement_text = search_replace_tuple + if os.path.exists(filepath): + logger.log_data('Add %s from filepath' % title, filepath) + + # Create a new scrolled window. + builder_temp = Gtk.Builder.new_from_file('scrolled_window.ui') + scrolled_window = builder_temp.get_object('scrolled_window') + + # Get the source buffer. + source_view = scrolled_window.get_child() + source_buffer = source_view.get_buffer() + + # Read the file, and add it to the source buffer. + with open(filepath, 'r') as file: + data = file.read() + source_buffer.set_text(data) + + # Add the new scrolled window to the stack. + stack.add_titled(scrolled_window, filepath, title) + + # Optionally replace text. + for search_replace_tuple in search_replace_tuples: + search_text, replacement_text = search_replace_tuple + logger.log_data( + 'Search and replace', + '%s ⊳ %s' % (search_text, + replacement_text)) + search_settings.set_search_text(search_text) + search_context = GtkSource.SearchContext.new( + source_buffer, + search_settings) + replacement_count = search_context.replace_all( + replacement_text, + -1) + logger.log_data('Number of matches', replacement_count) + else: logger.log_data( - 'Search and replace', - '%s ⊳ %s' % (search_text, - replacement_text)) - search_settings.set_search_text(search_text) - search_context = GtkSource.SearchContext.new( - source_buffer, - search_settings) - replacement_count = search_context.replace_all( - replacement_text, - -1) - logger.log_data('Number of matches', replacement_count) + 'Skip adding %s because the file does not exist' % title, + filepath) # This function blocks and does not use GLib.idle_add. diff -Nru cubic-2019.03-190/usr/share/cubic/transitions.py cubic-2019.03-191/usr/share/cubic/transitions.py --- cubic-2019.03-190/usr/share/cubic/transitions.py 2019-03-17 05:01:45.000000000 +0000 +++ cubic-2019.03-191/usr/share/cubic/transitions.py 2019-03-21 02:31:52.000000000 +0000 @@ -2959,9 +2959,12 @@ # Update filesystem.manifest-remove file. filename = 'filesystem.manifest-remove' is_exists = utilities.is_exists_filesystem_manifest_remove(filename) - if is_exists: - removable_packages_list = utilities.create_typical_removable_packages_list( - ) + removable_packages_list = utilities.create_typical_removable_packages_list( + ) + # Save the filesystem.manifest-remove file if there are packages to remove + # or if the file already exists. + if is_exists or removable_packages_list: + # This function will create the file if it does not exist. utilities.create_filesystem_manifest_remove_file( filename, removable_packages_list) @@ -2969,9 +2972,14 @@ # Update filesystem.manifest-minimal-remove file. filename = 'filesystem.manifest-minimal-remove' is_exists = utilities.is_exists_filesystem_manifest_remove(filename) - if is_exists: - removable_packages_list = utilities.create_minimal_removable_packages_list( - ) + removable_packages_list = utilities.create_minimal_removable_packages_list( + ) + # Save the filesystem.manifest-minimal-remove file if there are packages to + # remove or if the file already exists. If the file does not exist, there + # will not be any packages to remove. (In the future, if we may show the + # minimal remove column even when the file does not exist). + if is_exists or removable_packages_list: + # This function will create the file if it does not exist. utilities.create_filesystem_manifest_remove_file( filename, removable_packages_list) @@ -3082,7 +3090,7 @@ 'repackage_iso_page__copy_boot_files', display.PROCESSING) time.sleep(0.25) - utilities.copy_iso_boot_files(thread) + utilities.copy_vmlinuz_and_initrd_files(thread) display.update_status('repackage_iso_page__copy_boot_files', display.OK) time.sleep(1.00) diff -Nru cubic-2019.03-190/usr/share/cubic/utilities.py cubic-2019.03-191/usr/share/cubic/utilities.py --- cubic-2019.03-190/usr/share/cubic/utilities.py 2019-03-17 05:01:45.000000000 +0000 +++ cubic-2019.03-191/usr/share/cubic/utilities.py 2019-03-21 02:31:52.000000000 +0000 @@ -170,7 +170,7 @@ 'Replacement text not specified') return - with open(filepath, 'r+') as file: + with open(filepath, 'r') as file: file_contents = file.read() file_contents = re.sub(search_text, replacement_text, file_contents) file.seek(0) @@ -2663,6 +2663,15 @@ end_iter = source_buffer.get_end_iter() data = source_buffer.get_text(start_iter, end_iter, True) + # Create the parent directories (/preseed, /boot/grub, /isolinux, etc.) + # if they do not exist. + directory = os.path.dirname(filepath) + os.makedirs(directory, exist_ok=True) + os.chmod( + directory, + stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH | stat.S_IXUSR + | stat.S_IXGRP | stat.S_IXOTH) + # Write the file. with open(filepath, 'w') as file: file.write(data) @@ -2733,7 +2742,7 @@ os.chmod(filepath, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH) -def copy_iso_boot_files(thread): +def copy_vmlinuz_and_initrd_files(thread): logger.log_note('Update ISO boot files')