Revision ce66ae38 image_creator/os_type/unix.py

b/image_creator/os_type/unix.py
139 139
            self.out.output("Removing sensitive user data under %s" %
140 140
                            " ".join(homedirs))
141 141

  
142
        action = self.g.rm_rf
143
        if self._scrub_support:
144
            action = self.g.scrub_file
145
        else:
146
            self.out.warn("Sensitive data won't be scrubbed (not supported)")
142 147
        for homedir in homedirs:
143 148
            for data in self.sensitive_userdata:
144 149
                fname = "%s/%s" % (homedir, data)
145 150
                if self.g.is_file(fname):
146
                    self.g.scrub_file(fname)
151
                    action(fname)
147 152
                elif self.g.is_dir(fname):
148
                    self._foreach_file(fname, self.g.scrub_file, ftype='r')
153
                    self._foreach_file(fname, action, ftype='r')
149 154

  
150 155
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :

Also available in: Unified diff