Merge lp:~bregma/unity/lp-1486498 into lp:unity

Proposed by Stephen M. Webb
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 4030
Proposed branch: lp:~bregma/unity/lp-1486498
Merge into: lp:unity
Diff against target: 30 lines (+3/-4)
1 file modified
tools/unity.cmake (+3/-4)
To merge this branch: bzr merge lp:~bregma/unity/lp-1486498
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Brandon Schaefer (community) Approve
Review via email: mp+268504@code.launchpad.net

Commit message

changed the wording of the help message and warning message for the --reset option

Description of the change

Changed the wording of the help message and warning message for the --reset option. Also made the --reset option act as deprecated, so it goes ahead and performs the reset regardless.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/unity.cmake'
2--- tools/unity.cmake 2014-07-08 14:28:27 +0000
3+++ tools/unity.cmake 2015-08-19 15:57:25 +0000
4@@ -1,6 +1,6 @@
5 #!/usr/bin/python
6 # -*- coding: utf-8 -*-
7-# Copyright (C) 2010 Canonical
8+# Copyright (C) 2010, 2015 Canonical
9 #
10 # Authors:
11 # Didier Roche <didrocks@ubuntu.com>
12@@ -182,7 +182,7 @@
13 parser.add_option("--replace", action="store_true",
14 help="Run unity /!\ This is for compatibility with other desktop interfaces and acts the same as running unity without --replace")
15 parser.add_option("--reset", action="store_true",
16- help="Reset is not supported anymore. Deprecated option")
17+ help="(deprecated: provided for backwards compatibility)")
18 parser.add_option("--reset-icons", action="store_true",
19 help="Reset the default launcher icon.")
20 parser.add_option("-v", "--verbose", action="store_true",
21@@ -195,8 +195,7 @@
22 sys.exit(reset_to_distro())
23
24 if options.reset:
25- print ("ERROR: the reset option is now deprecated")
26- sys.exit(1)
27+ print ("The --reset option is deprecated, You should run with no options instead.")
28
29 if options.reset_icons:
30 reset_launcher_icons ()