Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5fd9bf0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove comment line in generated passwd file"

parents 43aea428 3b5d3b15

tools/fs_config/fs_config_generator.py

+0 −8
Original line number Diff line number Diff line
@@ -1216,10 +1216,6 @@ class OEMAidGen(BaseGenerator): 
class PasswdGen(BaseGenerator):

    """Generates the /etc/passwd file per man (5) passwd."""



    _GENERATED = ('#\n# THIS IS AN AUTOGENERATED FILE! DO NOT MODIFY!\n#')



    _FILE_COMMENT = '# Defined in file: \"%s\"'



    def __init__(self):



        self._old_file = None
@@ -1254,8 +1250,6 @@ class PasswdGen(BaseGenerator): 
        if len(aids) == 0:

            return



        print PasswdGen._GENERATED



        for aid in aids:

            if required_prefix is None or aid.friendly.startswith(required_prefix):

                self._print_formatted_line(aid)
@@ -1280,7 +1274,6 @@ class PasswdGen(BaseGenerator): 
        """

        if self._old_file != aid.found:

            self._old_file = aid.found

            print PasswdGen._FILE_COMMENT % aid.found



        try:

            logon, uid = Utils.get_login_and_uid_cleansed(aid)
@@ -1306,7 +1299,6 @@ class GroupGen(PasswdGen): 
        """

        if self._old_file != aid.found:

            self._old_file = aid.found

            print PasswdGen._FILE_COMMENT % aid.found



        try:

            logon, uid = Utils.get_login_and_uid_cleansed(aid)