Ubuntu One Windows Installer

Merge lp:~ralsina/ubuntuone-windows-installer/order-mattes into lp:ubuntuone-windows-installer

  1. order-mattes
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Merged
Merged at revision: 46
Proposed branch: lp:~ralsina/ubuntuone-windows-installer/order-mattes
Merge into: lp:ubuntuone-windows-installer
Diff against target: 25 lines (+2/-2)
2 files modified
ubuntuone_installer/gui/qt/folders.py (+1/-1)
ubuntuone_installer/gui/qt/local_folders.py (+1/-1)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-windows-installer/order-mattes
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+73727@code.launchpad.net

Commit message

Fix import order to make tools happy.

Description of the change

Fix import order to make tools happy.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (4.4 KiB)

The attempt to merge lp:~ralsina/ubuntuone-windows-installer/order-mattes into lp:ubuntuone-windows-installer failed. Below is the output from the failed tests.

running build
Compiled data/qt/local_folders.ui into ubuntuone_installer/gui/qt/ui/local_folders_ui.py
Compiled data/qt/preferences.ui into ubuntuone_installer/gui/qt/ui/preferences_ui.py
Compiled data/qt/congratulations.ui into ubuntuone_installer/gui/qt/ui/congratulations_ui.py
compiled data/qt/images.qrc into ubuntuone_installer/gui/qt/ui/images_rc.py
Compiled data/qt/folders.ui into ubuntuone_installer/gui/qt/ui/folders_ui.py
Compiled data/qt/sync_now_or_later.ui into ubuntuone_installer/gui/qt/ui/sync_now_or_later_ui.py
Compiled data/qt/license.ui into ubuntuone_installer/gui/qt/ui/license_ui.py
Compiled data/qt/choose_sign_in.ui into ubuntuone_installer/gui/qt/ui/choose_sign_in_ui.py
Compiled data/qt/side_widget.ui into ubuntuone_installer/gui/qt/ui/side_widget_ui.py
Compiled data/qt/sign_in.ui into ubuntuone_installer/gui/qt/ui/sign_in_ui.py
Compiled data/qt/setup_account.ui into ubuntuone_installer/gui/qt/ui/setup_account_ui.py
Compiled data/qt/are_you_sure.ui into ubuntuone_installer/gui/qt/ui/are_you_sure_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone_installer
copying ubuntuone_installer/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer
copying ubuntuone_installer/logger.py -> build/lib.linux-i686-2.7/ubuntuone_installer
creating build/lib.linux-i686-2.7/ubuntuone_installer/gui
copying ubuntuone_installer/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui
creating build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/enhanced_check_box.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/folders.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/forgotten.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/gui.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/side_widget.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/local_folders.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/setup_account.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/preferences.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/currentuser.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/sync_now_or_later.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/are_you_sure.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
running build_scripts
creating build/scripts-2.7
copying and adjusting bin/ubuntuone-installer-qt -> build/scripts-2.7
changing mode of build/scripts-2.7/ubuntuone-installer-qt from 644 to 755
running build_i18n
intltool-update -p ...

Read more...

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (4.4 KiB)

The attempt to merge lp:~ralsina/ubuntuone-windows-installer/order-mattes into lp:ubuntuone-windows-installer failed. Below is the output from the failed tests.

running build
Compiled data/qt/local_folders.ui into ubuntuone_installer/gui/qt/ui/local_folders_ui.py
Compiled data/qt/preferences.ui into ubuntuone_installer/gui/qt/ui/preferences_ui.py
Compiled data/qt/congratulations.ui into ubuntuone_installer/gui/qt/ui/congratulations_ui.py
compiled data/qt/images.qrc into ubuntuone_installer/gui/qt/ui/images_rc.py
Compiled data/qt/folders.ui into ubuntuone_installer/gui/qt/ui/folders_ui.py
Compiled data/qt/sync_now_or_later.ui into ubuntuone_installer/gui/qt/ui/sync_now_or_later_ui.py
Compiled data/qt/license.ui into ubuntuone_installer/gui/qt/ui/license_ui.py
Compiled data/qt/choose_sign_in.ui into ubuntuone_installer/gui/qt/ui/choose_sign_in_ui.py
Compiled data/qt/side_widget.ui into ubuntuone_installer/gui/qt/ui/side_widget_ui.py
Compiled data/qt/sign_in.ui into ubuntuone_installer/gui/qt/ui/sign_in_ui.py
Compiled data/qt/setup_account.ui into ubuntuone_installer/gui/qt/ui/setup_account_ui.py
Compiled data/qt/are_you_sure.ui into ubuntuone_installer/gui/qt/ui/are_you_sure_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone_installer
copying ubuntuone_installer/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer
copying ubuntuone_installer/logger.py -> build/lib.linux-i686-2.7/ubuntuone_installer
creating build/lib.linux-i686-2.7/ubuntuone_installer/gui
copying ubuntuone_installer/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui
creating build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/enhanced_check_box.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/folders.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/forgotten.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/gui.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/side_widget.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/local_folders.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/setup_account.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/preferences.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/currentuser.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/sync_now_or_later.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/are_you_sure.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
running build_scripts
creating build/scripts-2.7
copying and adjusting bin/ubuntuone-installer-qt -> build/scripts-2.7
changing mode of build/scripts-2.7/ubuntuone-installer-qt from 644 to 755
running build_i18n
intltool-update -p ...

Read more...

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (4.4 KiB)

The attempt to merge lp:~ralsina/ubuntuone-windows-installer/order-mattes into lp:ubuntuone-windows-installer failed. Below is the output from the failed tests.

running build
Compiled data/qt/local_folders.ui into ubuntuone_installer/gui/qt/ui/local_folders_ui.py
Compiled data/qt/preferences.ui into ubuntuone_installer/gui/qt/ui/preferences_ui.py
Compiled data/qt/congratulations.ui into ubuntuone_installer/gui/qt/ui/congratulations_ui.py
compiled data/qt/images.qrc into ubuntuone_installer/gui/qt/ui/images_rc.py
Compiled data/qt/folders.ui into ubuntuone_installer/gui/qt/ui/folders_ui.py
Compiled data/qt/sync_now_or_later.ui into ubuntuone_installer/gui/qt/ui/sync_now_or_later_ui.py
Compiled data/qt/license.ui into ubuntuone_installer/gui/qt/ui/license_ui.py
Compiled data/qt/choose_sign_in.ui into ubuntuone_installer/gui/qt/ui/choose_sign_in_ui.py
Compiled data/qt/side_widget.ui into ubuntuone_installer/gui/qt/ui/side_widget_ui.py
Compiled data/qt/sign_in.ui into ubuntuone_installer/gui/qt/ui/sign_in_ui.py
Compiled data/qt/setup_account.ui into ubuntuone_installer/gui/qt/ui/setup_account_ui.py
Compiled data/qt/are_you_sure.ui into ubuntuone_installer/gui/qt/ui/are_you_sure_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone_installer
copying ubuntuone_installer/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer
copying ubuntuone_installer/logger.py -> build/lib.linux-i686-2.7/ubuntuone_installer
creating build/lib.linux-i686-2.7/ubuntuone_installer/gui
copying ubuntuone_installer/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui
creating build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/__init__.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/enhanced_check_box.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/folders.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/forgotten.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/gui.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/side_widget.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/local_folders.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/setup_account.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/preferences.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/currentuser.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/sync_now_or_later.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
copying ubuntuone_installer/gui/qt/are_you_sure.py -> build/lib.linux-i686-2.7/ubuntuone_installer/gui/qt
running build_scripts
creating build/scripts-2.7
copying and adjusting bin/ubuntuone-installer-qt -> build/scripts-2.7
changing mode of build/scripts-2.7/ubuntuone-installer-qt from 644 to 755
running build_i18n
intltool-update -p ...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone_installer/gui/qt/folders.py'
2--- ubuntuone_installer/gui/qt/folders.py 2011-08-11 15:02:49 +0000
3+++ ubuntuone_installer/gui/qt/folders.py 2011-09-01 21:28:23 +0000
4@@ -21,7 +21,7 @@
5
6 import gettext
7
8-from PyQt4 import QtCore, QtGui
9+from PyQt4 import QtGui, QtCore
10 from ubuntu_sso.qt.gui import SSOWizardPage
11 from ubuntuone.controlpanel.gui.qt import folders
12
13
14=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
15--- ubuntuone_installer/gui/qt/local_folders.py 2011-08-30 14:21:28 +0000
16+++ ubuntuone_installer/gui/qt/local_folders.py 2011-09-01 21:28:23 +0000
17@@ -23,7 +23,7 @@
18 import Queue
19
20 from twisted.internet.defer import inlineCallbacks, returnValue
21-from PyQt4 import QtCore, QtGui
22+from PyQt4 import QtGui, QtCore
23 from ubuntuone.controlpanel import backend
24 from ubuntuone.controlpanel.gui import (
25 humanize,

Subscribers

People subscribed via source and target branches