Ubuntu Weather App

Merge lp:~sergiusens/ubuntu-weather-app/pkgname into lp:ubuntu-weather-app/obsolete.trunk

  1. pkgname
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 138
Merged at revision: 139
Proposed branch: lp:~sergiusens/ubuntu-weather-app/pkgname
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 64 lines (+6/-6)
3 files modified
components/Storage.qml (+3/-3)
tests/autopilot/ubuntu_weather_app/tests/__init__.py (+2/-2)
ubuntu-weather-app.qml (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/ubuntu-weather-app/pkgname
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Weather Developers Pending
Review via email: mp+189677@code.launchpad.net

Commit message

changing applicationName to com.ubuntu.weather to write in the unconfined areas

Description of the change

APP_PKGNAME == com.ubuntu.weather so we want the applicationName to be com.ubuntu.weather

  # Once LP: #1197051 and LP: #1197056 are fixed, just use these paths
  # Allow writes to various (application-specific) XDG directories
  owner @{HOME}/.cache/@{APP_PKGNAME}/ rw, # subdir of XDG_CACHE_HOME
  owner @{HOME}/.cache/@{APP_PKGNAME}/** mrwkl,
  owner @{HOME}/.config/@{APP_PKGNAME}/ rw, # subdir of XDG_CONFIG_HOME
  owner @{HOME}/.config/@{APP_PKGNAME}/** mrwkl,
  owner @{HOME}/.local/share/@{APP_PKGNAME}/ rw, # subdir of XDG_DATA_HOME
  owner @{HOME}/.local/share/@{APP_PKGNAME}/** mrwklix,
  owner /{,var/}run/user/*/confined/@{APP_PKGNAME}/ rw, # subdir of XDG_RUNTIME_DIR
  owner /{,var/}run/user/*/confined/@{APP_PKGNAME}/** mrwkl,

  # FIXME: LP: #1197051
  owner "@{HOME}/.local/share/Qt Project/" rw,
  owner "@{HOME}/.local/share/Qt Project/QtQmlViewer/" rw,
  owner "@{HOME}/.local/share/Qt Project/QtQmlViewer/QML/" rw,
  owner "@{HOME}/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/" rw,
  owner "@{HOME}/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases/" rw,
  owner "@{HOME}/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases/*" rwk,

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components/Storage.qml'
2--- components/Storage.qml 2013-09-28 11:31:43 +0000
3+++ components/Storage.qml 2013-10-07 18:06:50 +0000
4@@ -24,7 +24,7 @@
5 function openDB() {
6 if(db !== null) return;
7
8- db = LocalStorage.openDatabaseSync("ubuntu-weather-app", "", "Default Ubuntu weather app", 100000);
9+ db = LocalStorage.openDatabaseSync("com.ubuntu.weather", "", "Default Ubuntu weather app", 100000);
10
11 if (db.version === "") {
12 db.changeVersion("", "0.1",
13@@ -33,7 +33,7 @@
14 console.log('Database created');
15 });
16 // reopen database with new version number
17- db = LocalStorage.openDatabaseSync("ubuntu-weather-app", "", "Default Ubuntu weather app", 100000);
18+ db = LocalStorage.openDatabaseSync("com.ubuntu.weather", "", "Default Ubuntu weather app", 100000);
19 }
20
21 if(db.version === "0.1") {
22@@ -43,7 +43,7 @@
23 console.log('Settings table added, Database upgraded to v0.2');
24 });
25 // reopen database with new version number
26- db = LocalStorage.openDatabaseSync("ubuntu-weather-app", "", "Default Ubuntu weather app", 100000);
27+ db = LocalStorage.openDatabaseSync("com.ubuntu.weather", "", "Default Ubuntu weather app", 100000);
28 }
29
30 if(db.version === "0.2") {
31
32=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
33--- tests/autopilot/ubuntu_weather_app/tests/__init__.py 2013-10-07 17:37:25 +0000
34+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py 2013-10-07 18:06:50 +0000
35@@ -132,7 +132,7 @@
36
37 def find_db(self):
38 dbs_path = os.path.expanduser(
39- "~/.local/share/ubuntu-weather-app/Databases/")
40+ "~/.local/share/com.ubuntu.weather/Databases/")
41 if not os.path.exists(dbs_path):
42 return None
43
44@@ -144,7 +144,7 @@
45 for line in ini:
46 if "=" in line:
47 key, val = line.strip().split("=")
48- if key == "Name" and val == "ubuntu-weather-app":
49+ if key == "Name" and val == "com.ubuntu.weather":
50 try:
51 return ini_path.replace(".ini", ".sqlite")
52 except OSError:
53
54=== modified file 'ubuntu-weather-app.qml'
55--- ubuntu-weather-app.qml 2013-09-29 14:26:37 +0000
56+++ ubuntu-weather-app.qml 2013-10-07 18:06:50 +0000
57@@ -26,7 +26,7 @@
58 MainView {
59 // objectName for functional testing purposes (autopilot-qt5)
60 objectName: "weather"
61- applicationName: "ubuntu-weather-app"
62+ applicationName: "com.ubuntu.weather"
63
64 id: mainView
65

Subscribers

People subscribed via source and target branches