qtcreator-plugin-ubuntu

Merge lp:~bzoltan/qtcreator-plugin-ubuntu/saving_security_policy_groups into lp:qtcreator-plugin-ubuntu

  1. saving_security_policy_groups
  2. Merge into trunk
Proposed by Zoltan Balogh
Status: Merged
Approved by: Zsombor Egri
Approved revision: 55
Merged at revision: 55
Proposed branch: lp:~bzoltan/qtcreator-plugin-ubuntu/saving_security_policy_groups
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 10 lines (+0/-1)
1 file modified
src/ubuntu/ubuntupackagingwidget.cpp (+0/-1)
To merge this branch: bzr merge lp:~bzoltan/qtcreator-plugin-ubuntu/saving_security_policy_groups
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+195917@code.launchpad.net

Commit message

Fixing bug #1252965

Description of the change

The saving of the security policy groups were broken.

The list of the policy groups in the "Simple" tab was saved, but after that quickly overwriten with the content of the AppArmor tab. The problem was that the content of the AppArmor was not updated from the list before saving.

Single line fix

To post a comment you must log in.
Revision history for this message
Zsombor Egri (zsombi) wrote :

Looks good to me!

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntu/ubuntupackagingwidget.cpp'
2--- src/ubuntu/ubuntupackagingwidget.cpp 2013-10-01 13:44:33 +0000
3+++ src/ubuntu/ubuntupackagingwidget.cpp 2013-11-20 07:50:56 +0000
4@@ -204,7 +204,6 @@
5 }
6 m_apparmor.setPolicyGroups(m_projectName,items);
7 m_manifest.save();
8- m_apparmor.setRaw(ui->plainTextEditAppArmorJson->toPlainText());
9 m_apparmor.save();
10 save_excludes();
11

Subscribers

People subscribed via source and target branches

to all changes: