[apparmor] GSoC review r65

[Christian Boltz]

Hello,

the review for r65 is attached. I also found some \n fun in logprof and 
a broken genprof - see the review for details ;-)


Regards,

Christian Boltz
-- 
Wie meinte doch neulich ein OS/2 oder CygWin-User:
PATH=C:\backspace\return;E:\tab\newline;D:\home
W:\pakete\mypaket\configure --prefix=F:\fondlinge
[Ralf Corsepius in suse-programming]
-------------- next part --------------
------------------------------------------------------------
revno: 65
committer: Kshitij Gupta <kgupta8592 at gmail.com
branch nick: apparmor-profile-tools
timestamp: Fri 2013-09-20 19:20:41 +0530
message:
  rev 63-64, fixes man pages, messages


=== modified file 'Tools/manpages/aa-cleanprof.pod'
--- Tools/manpages/aa-cleanprof.pod	2013-09-19 05:02:19 +0000
+++ Tools/manpages/aa-cleanprof.pod	2013-09-20 13:50:41 +0000
@@ -18,13 +18,14 @@
 =head1 DESCRIPTION
 
 B<aa-cleanprof> is used to perform a cleanup on one or more profiles.
-The tool removes any existing superfluous rules, reorders the rules to group 
-similar rules together and removes all comments.
+The tool removes any existing superfluous rules (Rules that are covered 

# ... _r_ules that ...  (lowercase)

+under an include or another rule),reorders the rules to group similar rules

# rule),_reorders (missing space

+together and removes all comments.
 

=== modified file 'Tools/manpages/aa-logprof.pod'
--- Tools/manpages/aa-logprof.pod	2013-09-19 05:02:19 +0000
+++ Tools/manpages/aa-logprof.pod	2013-09-20 13:50:41 +0000
@@ -76,11 +75,14 @@
+The (I)gnore allows user to ignore the event, without making any changes to
+the AppArmor profile.

# That explains what (I)gnore does.
# A sentence explaining (D)eny would be nice ;-) (adds a "deny" rule, which silences logging)



=== added file 'Translate/README'
--- Translate/README	1970-01-01 00:00:00 +0000
+++ Translate/README	2013-09-20 13:50:41 +0000
@@ -0,0 +1,10 @@
+GENERATING TRANSLATION MESSAGES
+
+To generate the messages.pot file:
+
+Navigate to apparmor/ and run the following command.
+python pygettext.py aa.py  aamode.py cleanprofile.py common.py config.py logparser.py severity.py tools.py ui.py writeprofile.py yasti.py ./../Tools/aa*
+
+It will generate the messages.pot file in apparmor/

# running it from Translate/ as (untested!)
#     python pygettext.py ../apparmor/*.py ../Tools/aa-*
# probably makes things easier ;-)

# BTW: which package contains pygettext.py?


=== modified file 'Translate/messages.pot'
--- Translate/messages.pot	2013-09-19 15:50:40 +0000
+++ Translate/messages.pot	2013-09-20 13:50:41 +0000
+#: aa.py:288
+msgid "Unable to read first line from: %s : File Not Found"

# "... line from %s: File not found" (no : after from, and no space about %s) looks better



=== modified file 'apparmor/aa.py'
--- apparmor/aa.py	2013-09-19 15:50:40 +0000
+++ apparmor/aa.py	2013-09-20 13:50:41 +0000
@ -432,13 +432,13 @@
     local_profiles = []
     profile_hash = hasher()
     if repo_is_enabled():
-        UI_BusyStart('Coonecting to repository.....')
+        UI_BusyStart('Connecting to repository.....')

# nice typo fix ;-)
# now remove two dots (3 are enough) and make it translatable please ;-)

@ -831,11 +831,9 @@
+            UI_Important(_('Repository Error\nRegistration or Sigin was unsuccessful. User login\ninformation is required to upload profiles to the repository.\nThese changes could not be sent.\n'))

# Sig_n_in
 



# Various bugs:

# aa-logprof:
# [...]
# Profile:  /{usr/,}bin/ping
# Path:     /home/sys-var/run/nscd/db49BVmU
# Mode:     r
# Severity: 4
# 
#   1 - /home/sys-var/run/nscd/db49BVmU 
#  [2 - /home/*/run/nscd/db49BVmU]
# (A)llow / [(D)eny] / (I)gnore / (G)lob / Glob with (E)xtension / (N)ew / Abo(r)t / (F)inish / (M)ore
# 
# Enter new path:/var/run/nscd/db*                              <--- should be path: [user input] (missing space)
# 
# The specified path does not match this log entry:
# 
#   Log Entry:  /home/sys-var/run/nscd/db49BVmU
#   Entered Path:  /var/run/nscd/db*Do you really want to use this path?     <--- missing \n
# 
#                                                       <--- superfluous \n
# (Y)es / [(N)o]






 
# # python aa-genprof /bin/true
# Traceback (most recent call last):
#   File "aa-genprof", line 80, in <module>
#     apparmor.autodep(program)
#   File "/usr/lib/python2.7/site-packages/apparmor/aa.py", line 524, in autodep
#     if not repo_cfg and not cfg['repository'].get('url', False):
# UnboundLocalError: local variable 'repo_cfg' referenced before assignment


vim:ft=diff