From a9b77304c3ad187e8982fd67d1a6406c93ab9e40 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 2 Oct 2009 21:41:41 +0300 Subject: [PATCH] Permit file objects and file names to ts.addInstall() - largely removes the need for the klunky ts.hdrFromFdno() --- python/rpm/transaction.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/python/rpm/transaction.py b/python/rpm/transaction.py index dcb28d4..9c8de0c 100644 --- a/python/rpm/transaction.py +++ b/python/rpm/transaction.py @@ -44,7 +44,16 @@ class TransactionSet(_rpm.ts): else: return tuple(keys) - def addInstall(self, header, key, how="u"): + def addInstall(self, item, key, how="u"): + if isinstance(item, str): + f = file(item) + header = self.hdrFromFdno(f) + f.close() + elif isinstance(item, file): + header = self.hdrFromFdno(item) + else: + header = item + if not how in ['u', 'i']: raise ValueError, 'how argument must be "u" or "i"' upgrade = (how == "u") -- 2.7.4