[elbe-devel] [PATCH v4 4/8] Check existance of '/rfs/etc/apt/preferences' with 'lexist'

[dion at linutronix.de]

From: Olivier Dion <dion at linutronix.de>

Since we're going to write to '/rfs/etc/apt/preferences', we
want to make sure that we don't write to a broken link.

Also, change from using 'os.path' methods to 'self.rfs'
methods to be more consistent.

Signed-off-by: Olivier Dion <dion at linutronix.de>
Reviewed-by: Torben Hohn <torben.hogn at linutronix.de>
---
 elbepack/rfs.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/elbepack/rfs.py b/elbepack/rfs.py
index 8476d01b..0018c442 100644
--- a/elbepack/rfs.py
+++ b/elbepack/rfs.py
@@ -276,10 +276,10 @@ class BuildEnv (object):
 
     def create_apt_prefs(self):
 
-        filename = self.rfs.path + "/etc/apt/preferences"
+        filename =  "etc/apt/preferences"
 
-        if os.path.exists(filename):
-            os.remove(filename)
+        if self.rfs.lexists(filename):
+            self.rfs.remove(filename)
 
         self.rfs.mkdir_p("/etc/apt")
 
@@ -309,7 +309,7 @@ class BuildEnv (object):
              "pkgs": self.xml.node("/target/pkg-list"),
              "porgs": pinned_origins}
 
-        write_pack_template(filename, "preferences.mako", d)
+        write_pack_template(self.rfs.fname(filename), "preferences.mako", d)
 
     def seed_etc(self):
         passwd = self.xml.text("target/passwd")
-- 
2.11.0