diff options
| author | Joel Andres Granados <jgranado@redhat.com> | 2008-06-06 13:43:47 +0200 |
|---|---|---|
| committer | Joel Andres Granados <jgranado@redhat.com> | 2008-06-06 13:43:47 +0200 |
| commit | 601c2633ac81382fda976286d43ee87020661e26 (patch) | |
| tree | 2b99bffc69bbe5db2534e68d070ad9e4833afd19 /plugins | |
| parent | 42870594be17d82c3d7752f3b588b5732c876303 (diff) | |
| download | firstaidkit-601c2633ac81382fda976286d43ee87020661e26.tar.gz firstaidkit-601c2633ac81382fda976286d43ee87020661e26.tar.xz firstaidkit-601c2633ac81382fda976286d43ee87020661e26.zip | |
Always use os.path.join when using the chroon.
This will avoid the double backslash.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/plugin_rpm_lowlevel/__init__.py | 6 | ||||
| -rw-r--r-- | plugins/plugin_rpm_lowlevel/issue_locks.py | 2 | ||||
| -rw-r--r-- | plugins/plugin_rpm_lowlevel/issue_packages.py | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/plugins/plugin_rpm_lowlevel/__init__.py b/plugins/plugin_rpm_lowlevel/__init__.py index 3d003b5..b4daef9 100644 --- a/plugins/plugin_rpm_lowlevel/__init__.py +++ b/plugins/plugin_rpm_lowlevel/__init__.py @@ -24,6 +24,8 @@ from pyfirstaidkit import Config from issue_packages import Packages from issue_locks import Locks +import os.path + class RPMLowlevelPlugin(IssuesPlugin): """This plugin provides lowlevel checks for RPM database.""" # @@ -52,11 +54,11 @@ class RPMLowlevelPlugin(IssuesPlugin): def backup(self): IssuesPlugin.backup(self) - self.backup.backupPath(path = Config.system.root+"/var/lib/rpm", name="rpm") + self.backup.backupPath(path = os.path.join(Config.system.root,"/var/lib/rpm"), name="rpm") self._result=ReturnSuccess def restore(self): - self.backup.restorePath(path = Config.system.root+"/var/lib/rpm", name="rpm") + self.backup.restorePath(path = os.path.join(Config.system.root,"/var/lib/rpm"), name="rpm") IssuesPlugin.restore(self) self._result=ReturnSuccess diff --git a/plugins/plugin_rpm_lowlevel/issue_locks.py b/plugins/plugin_rpm_lowlevel/issue_locks.py index da77e3a..d64c3f7 100644 --- a/plugins/plugin_rpm_lowlevel/issue_locks.py +++ b/plugins/plugin_rpm_lowlevel/issue_locks.py @@ -38,7 +38,7 @@ class Locks(Issue): if result is not None: return result - path = Config.system.root+"/var/lib/rpm/" + path = os.path.join(Config.system.root,"/var/lib/rpm/") self.locks = [] def walkfunc(arg, dirname, fnames): diff --git a/plugins/plugin_rpm_lowlevel/issue_packages.py b/plugins/plugin_rpm_lowlevel/issue_packages.py index d24ada6..34bac91 100644 --- a/plugins/plugin_rpm_lowlevel/issue_packages.py +++ b/plugins/plugin_rpm_lowlevel/issue_packages.py @@ -23,7 +23,7 @@ from pyfirstaidkit.issue import Issue from pyfirstaidkit.reporting import TASK from pyfirstaidkit.utils import spawnvch from pyfirstaidkit.configuration import Config -import os +import os, os.path class Packages(Issue): @@ -35,7 +35,7 @@ class Packages(Issue): if result is not None: return result - dbname = Config.system.root+"/var/lib/rpm/Packages" + dbname = os.path.join(Config.system.root, "/var/lib/rpm/Packages") self._happened = False if not os.path.isfile(os.path.realpath(dbname)): @@ -63,7 +63,7 @@ class Packages(Issue): if result is not None: return result - dbname = Config.system.root+"/var/lib/rpm/Packages" + dbname = os.path.join(Config.system.root,"/var/lib/rpm/Packages") if not self._db_missing: #dump&load the database |