From 503b8f83a0ff9e0f4b6edcfffcf0bfc3b1bd4495 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Fri, 29 Jan 2010 08:53:34 +0100 Subject: [PATCH] [entropy.client] unbundle hardcoded strings in add_package_to_repos, do not use etpSys --- libraries/entropy/client/interfaces/methods.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entropy/client/interfaces/methods.py b/libraries/entropy/client/interfaces/methods.py index 77b8762f1..78205e668 100644 --- a/libraries/entropy/client/interfaces/methods.py +++ b/libraries/entropy/client/interfaces/methods.py @@ -499,7 +499,7 @@ class RepositoryMixin: atoms_contained = [] basefile = os.path.basename(pkg_file) db_dir = tempfile.mkdtemp() - dbfile = os.path.join(db_dir, "packages.db") + dbfile = os.path.join(db_dir, etpConst['etpdatabasefile']) dump_rc = entropy.tools.dump_entropy_metadata(pkg_file, dbfile) if not dump_rc: return -1, atoms_contained @@ -524,7 +524,7 @@ class RepositoryMixin: repodata[basefile]['smartpackage'] = True for myidpackage in myidpackages: compiled_arch = mydbconn.retrieveDownloadURL(myidpackage) - if compiled_arch.find("/"+etpSys['arch']+"/") == -1: + if compiled_arch.find("/"+etpConst['currentarch']+"/") == -1: return -3, atoms_contained atoms_contained.append((int(myidpackage), basefile))