diff -Nru usb-creator-0.3.16/debian/changelog usb-creator-0.3.17/debian/changelog --- usb-creator-0.3.16/debian/changelog 2022-12-16 22:03:06.000000000 +0000 +++ usb-creator-0.3.17/debian/changelog 2023-06-09 17:21:00.000000000 +0000 @@ -1,3 +1,10 @@ +usb-creator (0.3.17) mantic; urgency=medium + + * Resolve an issue where the --iso argument was ignored when there are ISO + files in the ~/Downloads directory. Thanks to Atlas Yu for the patch. + + -- Brian Murray Fri, 09 Jun 2023 10:21:00 -0700 + usb-creator (0.3.16) lunar; urgency=medium * Update versions stings and manpage thanks to Akbarkhon Variskhanov for the diff -Nru usb-creator-0.3.16/usbcreator/frontends/gtk/frontend.py usb-creator-0.3.17/usbcreator/frontends/gtk/frontend.py --- usb-creator-0.3.16/usbcreator/frontends/gtk/frontend.py 2022-12-16 21:42:59.000000000 +0000 +++ usb-creator-0.3.17/usbcreator/frontends/gtk/frontend.py 2023-06-09 17:18:26.000000000 +0000 @@ -137,11 +137,15 @@ self.setup_targets_treeview() # Pre-populate the source view. + search_dir_ids = [] if img is not None: self.backend.add_image(img) self.source_vbox.hide() + else: + search_dir_ids = [GLib.UserDirectory.DIRECTORY_DOWNLOAD, + GLib.UserDirectory.DIRECTORY_DESKTOP] - for search_dir_id in [GLib.UserDirectory.DIRECTORY_DOWNLOAD, GLib.UserDirectory.DIRECTORY_DESKTOP]: + for search_dir_id in search_dir_ids: search_dir = GLib.get_user_special_dir(search_dir_id) if search_dir and os.path.isdir(search_dir): # TODO evand 2009-10-22: File type detection based on file(1). diff -Nru usb-creator-0.3.16/usbcreator/frontends/kde/frontend.py usb-creator-0.3.17/usbcreator/frontends/kde/frontend.py --- usb-creator-0.3.16/usbcreator/frontends/kde/frontend.py 2022-12-16 21:42:59.000000000 +0000 +++ usb-creator-0.3.17/usbcreator/frontends/kde/frontend.py 2023-06-09 17:18:26.000000000 +0000 @@ -90,12 +90,12 @@ #add any file sources passed if self.__img is not None: self.__backend.add_image(misc.text_type(self.__img)) - - downloadsDir = QDir(QStandardPaths.standardLocations(QStandardPaths.DownloadLocation)[0]) - isoFilter = [] - isoFilter.append("*.iso") - for iso in downloadsDir.entryList(isoFilter, QDir.Files): - self.__backend.add_image(misc.text_type(downloadsDir.absoluteFilePath(iso))) + else: + downloadsDir = QDir(QStandardPaths.standardLocations(QStandardPaths.DownloadLocation)[0]) + isoFilter = [] + isoFilter.append("*.iso") + for iso in downloadsDir.entryList(isoFilter, QDir.Files): + self.__backend.add_image(misc.text_type(downloadsDir.absoluteFilePath(iso))) def test_func(*a): if not queue.empty():