Merge lp:~elachuni/ubuntu-webcatalog/waiting-music into lp:ubuntu-webcatalog

Proposed by Anthony Lenton
Status: Merged
Approved by: Anthony Lenton
Approved revision: 145
Merged at revision: 145
Proposed branch: lp:~elachuni/ubuntu-webcatalog/waiting-music
Merge into: lp:ubuntu-webcatalog
Prerequisite: lp:~elachuni/ubuntu-webcatalog/noreviews-last
Diff against target: 40 lines (+7/-2)
1 file modified
src/webcatalog/management/commands/import_app_install_data.py (+7/-2)
To merge this branch: bzr merge lp:~elachuni/ubuntu-webcatalog/waiting-music
Reviewer Review Type Date Requested Status
Canonical Consumer Applications Hackers Pending
Review via email: mp+111014@code.launchpad.net

Commit message

Made import_app_install_dat print musical notes to report progress.

Description of the change

This branch makes import_app_install_data (and import_all_app_install_data) print musical notes instead of periods to report progress.

To post a comment you must log in.
Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

The prerequisite lp:~elachuni/ubuntu-webcatalog/noreviews-last has not yet been merged into lp:ubuntu-webcatalog.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
2--- src/webcatalog/management/commands/import_app_install_data.py 2012-06-06 16:38:11 +0000
3+++ src/webcatalog/management/commands/import_app_install_data.py 2012-06-19 13:30:23 +0000
4@@ -30,6 +30,7 @@
5
6 from glob import iglob
7 from optparse import make_option
8+from random import choice
9 from tempfile import NamedTemporaryFile
10
11 import apt
12@@ -50,6 +51,10 @@
13 __all__ = []
14
15
16+def progress_char():
17+ return choice(u'♩♪')
18+
19+
20 class CacheMaker(object):
21 sources = """
22 deb http://archive.ubuntu.com/ubuntu {distroseries} main universe
23@@ -161,7 +166,7 @@
24 if self.verbosity > 1:
25 self.output("Processing {0}\n".format(desktop_file), 1)
26 elif self.verbosity > 0:
27- self.output(".", 1, flush=True)
28+ self.output(progress_char(), 1, flush=True)
29 self.process_desktop_file(desktop_file, icon_dir, distroseries)
30
31 shutil.rmtree(data_dir)
32@@ -282,7 +287,7 @@
33 if self.verbosity > 1:
34 self.output("Updating {0}\n".format(package.name), 1)
35 elif self.verbosity > 0:
36- self.output(".", 1, flush=True)
37+ self.output(progress_char(), 1, flush=True)
38 candidate = package.candidate
39 # USC uses the first line of the summary as the
40 # application name and the rest as the comment..

Subscribers

People subscribed via source and target branches