summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-07-11 17:05:54 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-07-11 17:05:54 +0000
commit54c84db34d5547dabe6bb33cac9a81a62b76ace0 (patch)
treecab297bd04e3a15f4a42c23de8ee2438144aea6d
parentfb0caf19c365cf89523e2725599781b05698a59f (diff)
downloadportage-54c84db34d5547dabe6bb33cac9a81a62b76ace0.tar.gz
portage-54c84db34d5547dabe6bb33cac9a81a62b76ace0.tar.bz2
portage-54c84db34d5547dabe6bb33cac9a81a62b76ace0.zip
Assign 'cfgprot' before referencing it. Reported by Thomas Sachau.
svn path=/main/trunk/; revision=13814
-rw-r--r--pym/portage/dbapi/vartree.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index a5b39e317..486439718 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3834,13 +3834,13 @@ class dblink(object):
protected = self.isprotected(mydest)
if mydmode != None:
# destination file exists
+ cfgprot = 0
if stat.S_ISDIR(mydmode):
# install of destination is blocked by an existing directory with the same name
cfgprot = 1
showMessage("!!! %s\n" % mydest,
level=logging.ERROR, noiselevel=-1)
elif stat.S_ISREG(mydmode) or (stat.S_ISLNK(mydmode) and os.path.exists(mydest) and stat.S_ISREG(os.stat(mydest)[stat.ST_MODE])):
- cfgprot = 0
# install of destination is blocked by an existing regular file,
# or by a symlink to an existing regular file;
# now, config file management may come into play.