diff -Nru customizer-4.1.5/data/customizer.conf customizer-4.1.5/data/customizer.conf --- customizer-4.1.5/data/customizer.conf 2017-02-27 22:01:57.000000000 +0000 +++ customizer-4.1.5/data/customizer.conf 2017-10-06 01:43:44.000000000 +0000 @@ -17,3 +17,5 @@ ISO = DEB = HOOK = +KERNEL = default +PURGE_KERNEL = True diff -Nru customizer-4.1.5/debian/bzr-builder.manifest customizer-4.1.5/debian/bzr-builder.manifest --- customizer-4.1.5/debian/bzr-builder.manifest 2017-02-27 22:01:57.000000000 +0000 +++ customizer-4.1.5/debian/bzr-builder.manifest 2017-10-06 01:43:44.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~296 -lp:~eloaders/customizer/stable revid:git-v1:562164cc44560afd1869fae70253a80f7b95c3ca +# bzr-builder format 0.3 deb-version {debupstream}-0~302 +lp:~eloaders/customizer/stable revid:git-v1:70fda48e9bb942b69cffd4d511f11911ddf0a3b2 diff -Nru customizer-4.1.5/debian/changelog customizer-4.1.5/debian/changelog --- customizer-4.1.5/debian/changelog 2017-02-27 22:01:57.000000000 +0000 +++ customizer-4.1.5/debian/changelog 2017-10-06 01:43:44.000000000 +0000 @@ -1,8 +1,8 @@ -customizer (4.1.5-0~296~ubuntu17.04.1) zesty; urgency=low +customizer (4.1.5-0~302~ubuntu17.04.1) zesty; urgency=low * Auto build. - -- Sonicwalker Mon, 27 Feb 2017 22:01:57 +0000 + -- Sonicwalker Fri, 06 Oct 2017 01:43:44 +0000 customizer (4.1.5-0+20170208) unstable; urgency=medium diff -Nru customizer-4.1.5/Makefile customizer-4.1.5/Makefile --- customizer-4.1.5/Makefile 2017-02-27 22:01:57.000000000 +0000 +++ customizer-4.1.5/Makefile 2017-10-06 01:43:44.000000000 +0000 @@ -46,11 +46,11 @@ check-pyqt4: @echo "Using python$(PYTHON_VERSION) to test for PyQT4:" - @$(PYTHON) -c 'import PyQt4' && echo 'PyQt4 has been found' + -@$(PYTHON) -c 'import PyQt4' && echo 'PyQt4 has been found' check-pyqt5: @echo "Using python$(PYTHON_VERSION) to test for PyQT5:" - @$(PYTHON) -c 'import PyQt5' && echo 'PyQt5 has been found' + -@$(PYTHON) -c 'import PyQt5' && echo 'PyQt5 has been found' core: $(SED) -e 's|@VERSION@|$(VERSION)|' -e 's|@PREFIX@|$(PREFIX)|g' \ diff -Nru customizer-4.1.5/src/actions/extract.py customizer-4.1.5/src/actions/extract.py --- customizer-4.1.5/src/actions/extract.py 2017-02-27 22:01:57.000000000 +0000 +++ customizer-4.1.5/src/actions/extract.py 2017-10-06 01:43:44.000000000 +0000 @@ -22,7 +22,7 @@ global mount_dir if not os.path.isfile(config.ISO): raise(message.exception('ISO does not exist', config.ISO)) - elif not config.ISO.endswith('.iso'): + elif not u'{}'.format(config.ISO).endswith('.iso'): raise(message.exception('File is not ISO', config.ISO)) common.clean_work_dirs() diff -Nru customizer-4.1.5/src/gui.py.in customizer-4.1.5/src/gui.py.in --- customizer-4.1.5/src/gui.py.in 2017-02-27 22:01:57.000000000 +0000 +++ customizer-4.1.5/src/gui.py.in 2017-10-06 01:43:44.000000000 +0000 @@ -63,6 +63,9 @@ def msg_critical(msg): QMessageBox.critical(MainWindow, app.tr('Critical'), u'{0}'.format(msg)) +def msg_question(msg): + return QMessageBox.question(MainWindow, app.tr('Question'), u'{0}'.format(msg)) + # limit instances to one lock = '/run/lock/customizer' running = False @@ -87,6 +90,7 @@ class ThreadMailbox(QObject): # Note that because we use a string to specify the type of # the QString argument then this code will run under Python v2 and v3. + question_messagebox = pyqtSignal(['QString']) critical_messagebox = pyqtSignal(['QString']) warning_messagebox = pyqtSignal(['QString']) info_messagebox = pyqtSignal(['QString']) @@ -189,6 +193,7 @@ ui.rebuildButton.setEnabled(False) ui.cleanButton.setEnabled(False) ui.extraCustomizationBox.setEnabled(False) + main_thread_mailbox.question_messagebox.connect(msg_question) main_thread_mailbox.critical_messagebox.connect(msg_critical) main_thread_mailbox.warning_messagebox.connect(msg_warning) main_thread_mailbox.info_messagebox.connect(msg_info) @@ -300,11 +305,12 @@ msg_critical(detail) def run_clean(): - message.sub_debug('Starting Cleaning...') - try: - worker(clean.main) - except Exception as detail: - msg_critical(detail) + if msg_question(app.tr('Confirm cleaning?')) == QMessageBox.Yes: + message.sub_debug('Starting Cleaning...') + try: + worker(clean.main) + except Exception as detail: + msg_critical(detail) def edit_sources(): message.sub_debug('Trying to edit sources...') diff -Nru customizer-4.1.5/src/lib/config.py customizer-4.1.5/src/lib/config.py --- customizer-4.1.5/src/lib/config.py 2017-02-27 22:01:57.000000000 +0000 +++ customizer-4.1.5/src/lib/config.py 2017-10-06 01:43:44.000000000 +0000 @@ -42,8 +42,8 @@ ISO = '{}'.format(conf.get('saved', 'ISO')) DEB = '{}'.format(conf.get('saved', 'DEB')) HOOK = '{}'.format(conf.get('saved', 'HOOK')) -KERNEL = '{}'.format(conf.get('saved', 'KERNEL', fallback='default')) -PURGE_KERNEL = '{}'.format(conf.get('saved', 'PURGE_KERNEL', fallback=True)) +KERNEL = '{}'.format(conf.get('saved', 'KERNEL')) +PURGE_KERNEL = '{}'.format(conf.get('saved', 'PURGE_KERNEL')) MOUNT_DIR = '/media' FILESYSTEM_DIR = os.path.join(WORK_DIR, 'FileSystem') diff -Nru customizer-4.1.5/tr/customizer_bg_BG.ts customizer-4.1.5/tr/customizer_bg_BG.ts --- customizer-4.1.5/tr/customizer_bg_BG.ts 2017-02-27 22:01:57.000000000 +0000 +++ customizer-4.1.5/tr/customizer_bg_BG.ts 2017-10-06 01:43:44.000000000 +0000 @@ -3,219 +3,219 @@ MainWindow - + Customizer GUI Customizer ГПИ - + Select ISO Избери ISO - + Rebuild ISO - + QEMU QEMU - + Clean Изчисти - + Customization Персонализации - + Edit sources Промени източници - + Archive Архив - + Install DEB Инсталирай ДЕБ - + Terminal Терминал - + Desktop Десктоп - + Execute hook Изпълни кука - + Configuration Конфигурация - + Hostname Име на хоста - + Live user Жив потребител - + Main Основни - + X-nest resolution Х-нест резолюция - + Change Промени - + Working directory Работна директория - + QEMU RAM (in MB) QEMU РАМ (в МБ) - + C - + Locales Локализации - + 64 - + 128 - + 256 - + 512 - + 1024 - + 2048 - + 4086 - + 640x480 - + 800x600 - + 1024x768 - + SquashFS format SquashFS формат - + xz - + gzip - + Settings Настройки - + <html><head/><body><p><span style=" font-weight:600;">set on runtime!</span></p></body></html> - + Extra Customization Допълнителни персонализации - + Browse FileSystem Разгледай FileSystem - + Browse ISO Разгледай ISO - + Extra Допълнителни - + For details, see: /usr/share/customizer/contributors /usr/share/customizer/copyright - + About @@ -238,59 +238,69 @@ Критично - + An instance of Customizer is already running. Инстанция на Customizer вече е стартирана. - + You are attempting to run Customizer with Python 3. Опитвате се да стартирате Customizer с Python 3. - + The filesystem is not valid or corrupted. Clean is recommended. Файловата система не е валидна или е повредена. Изчистване е препоръчително. - + No supported terminal emulator detected. Не е намерен терминал, който се поддържа. - + Open Отвори - + ISO Files (*.iso);;All Files (*) ISO Файлове (*.iso);;Всички Файлове (*) - + No supported text editor detected. Не е намерен текстов редактор, който се поддържа. - + Deb Files (*.deb);;All Files (*) Deb Файлове (*.deb);;Всички Файлове (*) - + Shell Scripts (*.sh);;All Files (*) Скриптове на Обвивката (*.sh);;Всички Файлове (*) - + No supported file manager detected. Не е намерен файлов мениджър, който се поддържа. - + Live user can not be empty. + + + Question + + + + + Confirm cleaning? + + diff -Nru customizer-4.1.5/tr/customizer_ko_KR.ts customizer-4.1.5/tr/customizer_ko_KR.ts --- customizer-4.1.5/tr/customizer_ko_KR.ts 2017-02-27 22:01:57.000000000 +0000 +++ customizer-4.1.5/tr/customizer_ko_KR.ts 2017-10-06 01:43:44.000000000 +0000 @@ -3,219 +3,219 @@ MainWindow - + Customizer GUI 커스터마이저 GUI - + Select ISO ISO 선택 - + Rebuild ISO ISO 다시빌드 - + QEMU QEMU - + Clean 청소 - + Customization 사용자 지정 - + Edit sources 소스 수정 - + Archive 아카이브 - + Install DEB DEB 설치 - + Terminal 터미널 - + Desktop 데스크탑 - + Execute hook 후크 실행 - + Configuration 구성 - + Hostname 호스트 이름 - + Live user 라이브 유저 - + Main 메인 - + X-nest resolution Х-нест 해상도 - + Change 변경 - + Working directory 작업 디렉토리 - + QEMU RAM (in MB) QEMU 램 (in MB) - + C C - + Locales 위치 - + 64 64 - + 128 128 - + 256 256 - + 512 512 - + 1024 1024 - + 2048 2048 - + 4086 4086 - + 640x480 640x480 - + 800x600 800x600 - + 1024x768 1024x768 - + SquashFS format SquashFS 형식 - + xz xz - + gzip gzip - + Settings 세팅 - + <html><head/><body><p><span style=" font-weight:600;">set on runtime!</span></p></body></html> - + Extra Customization 커스터마이징 추가 - + Browse FileSystem 파일시스템 탐색 - + Browse ISO ISO 탐색 - + Extra 추가 - + For details, see: /usr/share/customizer/contributors /usr/share/customizer/copyright - + About @@ -238,59 +238,69 @@ 치명적 - + An instance of Customizer is already running. 커스터마이저의 한 예가 이미 실행중입니다. - + You are attempting to run Customizer with Python 3. 당신은 파이썬 3으로 커스터마이저를 실행하려고합니다. - + The filesystem is not valid or corrupted. Clean is recommended. 파일시스템이 잘못되거나 손상되었습니다. 청소를 하는 것이 좋습니다. - + No supported terminal emulator detected. 지원되는 터미널 에뮬레이터가 감지 되지 않습니다. - + Open 열기 - + ISO Files (*.iso);;All Files (*) ISO 파일 (*.iso);;모든 파일 (*) - + No supported text editor detected. 지원되는 텍스트 에디터가 감지 되지 않습니다. - + Deb Files (*.deb);;All Files (*) Deb 파일 (*.deb);;모든 파일 (*) - + Shell Scripts (*.sh);;All Files (*) 쉘 스크립트 (*.sh);;모든 파일 (*) - + No supported file manager detected. 지원되는 파일 탐색기가 감지 되지 않습니다. - + Live user can not be empty. - 라이브 유저는 비워 둘 수 없습니다 . + 라이브 유저는 비워 둘 수 없습니다 . + + + + Question + 질문 + + + + Confirm cleaning? + 청소 확인?