* [PATCH] python-smartpm: really ignore conflicts during install with --attempt @ 2014-02-06 13:39 Paul Eggleton 2014-02-09 23:25 ` Richard Purdie 0 siblings, 1 reply; 6+ messages in thread From: Paul Eggleton @ 2014-02-06 13:39 UTC (permalink / raw) To: openembedded-core The original patch added in OE-Core commit bdf07b1698d228dc7ff555199a269b1ff8ceca19 was supposed to ignore conflicts, but it was unable to do so because it wasn't raising errors in the right place. When the --attempt option is used (as is done in complementary package installation for RPM), raise errors immediately on conflicts, catch errors at the right point so that requested packages and their dependencies can be ignored, and print appropriate warnings when doing so. Fixes [YOCTO #5313]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- .../python/python-smartpm/smart-attempt.patch | 134 +++++++++++++++++++-- 1 file changed, 121 insertions(+), 13 deletions(-) diff --git a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch index 0d603d3..1136182 100644 --- a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch +++ b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch @@ -1,18 +1,27 @@ -Add a mechanism to attempt the install operation, w/o failing. +From 7ee23804a06f81476cc2b31a6db11b52d7af764e Mon Sep 17 00:00:00 2001 +From: Mark Hatle <mark.hatle@windriver.com> +Date: Mon, 20 Jan 2014 14:30:52 +0000 +Subject: [PATCH] Add mechanism to attempt install without failing -For complementary and 'attemptonly' packages, we need a way to instruct smart to -try to install, but ignore any failures. +In OpenEmbedded, for complementary and 'attemptonly' package processing, +we need a way to instruct smart to try to install, but ignore any +failures (usually conflicts). This option only works for the install operation. Upstream-Status: Pending Signed-off-by: Mark Hatle <mark.hatle@windriver.com> +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- + smart/commands/install.py | 5 ++++ + smart/transaction.py | 65 +++++++++++++++++++++++++++++++++++------------ + 2 files changed, 54 insertions(+), 16 deletions(-) -Index: smart-1.4.1/smart/commands/install.py -=================================================================== ---- smart-1.4.1.orig/smart/commands/install.py -+++ smart-1.4.1/smart/commands/install.py +diff --git a/smart/commands/install.py b/smart/commands/install.py +index 590222c..6ef9682 100644 +--- a/smart/commands/install.py ++++ b/smart/commands/install.py @@ -50,6 +50,8 @@ def option_parser(): parser = OptionParser(usage=USAGE, description=DESCRIPTION, @@ -32,11 +41,106 @@ Index: smart-1.4.1/smart/commands/install.py if opts.explain: sysconf.set("explain-changesets", True, soft=True) -Index: smart-1.4.1/smart/transaction.py -=================================================================== ---- smart-1.4.1.orig/smart/transaction.py -+++ smart-1.4.1/smart/transaction.py -@@ -1216,9 +1216,17 @@ class Transaction(object): +diff --git a/smart/transaction.py b/smart/transaction.py +index 5730a42..e3e61c6 100644 +--- a/smart/transaction.py ++++ b/smart/transaction.py +@@ -555,6 +555,8 @@ class Transaction(object): + changeset.set(pkg, INSTALL) + isinst = changeset.installed + ++ attempt = sysconf.has("attempt-install", soft=True) ++ + # Remove packages conflicted by this one. + for cnf in pkg.conflicts: + for prv in cnf.providedby: +@@ -564,11 +566,16 @@ class Transaction(object): + if not isinst(prvpkg): + locked[prvpkg] = (LOCKED_CONFLICT_BY, pkg) + continue +- if prvpkg in locked: +- raise Failed, _("Can't install %s: conflicted package " +- "%s is locked") % (pkg, prvpkg) +- self._remove(prvpkg, changeset, locked, pending, depth) +- pending.append((PENDING_UPDOWN, prvpkg)) ++ if attempt: ++ del changeset[pkg] ++ raise Failed, _("Can't install %s: it conflicts with package " ++ "%s") % (pkg, prvpkg) ++ else: ++ if prvpkg in locked: ++ raise Failed, _("Can't install %s: conflicted package " ++ "%s is locked") % (pkg, prvpkg) ++ self._remove(prvpkg, changeset, locked, pending, depth) ++ pending.append((PENDING_UPDOWN, prvpkg)) + + # Remove packages conflicting with this one. + for prv in pkg.provides: +@@ -579,12 +586,18 @@ class Transaction(object): + if not isinst(cnfpkg): + locked[cnfpkg] = (LOCKED_CONFLICT, pkg) + continue +- if cnfpkg in locked: ++ if attempt: ++ del changeset[pkg] + raise Failed, _("Can't install %s: it's conflicted by " +- "the locked package %s") \ +- % (pkg, cnfpkg) +- self._remove(cnfpkg, changeset, locked, pending, depth) +- pending.append((PENDING_UPDOWN, cnfpkg)) ++ "the package %s") \ ++ % (pkg, cnfpkg) ++ else: ++ if cnfpkg in locked: ++ raise Failed, _("Can't install %s: it's conflicted by " ++ "the locked package %s") \ ++ % (pkg, cnfpkg) ++ self._remove(cnfpkg, changeset, locked, pending, depth) ++ pending.append((PENDING_UPDOWN, cnfpkg)) + + # Remove packages with the same name that can't + # coexist with this one. +@@ -594,10 +607,15 @@ class Transaction(object): + if not isinst(namepkg): + locked[namepkg] = (LOCKED_NO_COEXIST, pkg) + continue +- if namepkg in locked: ++ if attempt: ++ del changeset[pkg] + raise Failed, _("Can't install %s: it can't coexist " + "with %s") % (pkg, namepkg) +- self._remove(namepkg, changeset, locked, pending, depth) ++ else: ++ if namepkg in locked: ++ raise Failed, _("Can't install %s: it can't coexist " ++ "with %s") % (pkg, namepkg) ++ self._remove(namepkg, changeset, locked, pending, depth) + + # Install packages required by this one. + for req in pkg.requires + pkg.recommends: +@@ -1176,6 +1194,8 @@ class Transaction(object): + + self._policy.runStarting() + ++ attempt = sysconf.has("attempt-install", soft=True) ++ + try: + changeset = self._changeset.copy() + isinst = changeset.installed +@@ -1190,7 +1210,11 @@ class Transaction(object): + locked[pkg] = (LOCKED_KEEP, None) + elif op is INSTALL: + if not isinst(pkg) and pkg in locked: +- raise Failed, _("Can't install %s: it's locked") % pkg ++ if attempt: ++ iface.warning(_("Can't install %s: it's locked") % pkg) ++ del changeset[pkg] ++ else: ++ raise Failed, _("Can't install %s: it's locked") % pkg + changeset.set(pkg, INSTALL) + locked[pkg] = (LOCKED_INSTALL, None) + elif op is REMOVE: +@@ -1216,9 +1240,18 @@ class Transaction(object): else: op = REMOVE if op is INSTALL or op is REINSTALL: @@ -48,7 +152,8 @@ Index: smart-1.4.1/smart/transaction.py + if pkg in changeset: + changeset.setRequested(pkg, True) + except Failed, e: -+ if sysconf.has("attempt-install", soft=True): ++ if attempt: ++ iface.warning(_("Can't install %s: %s") % (pkg, e)) + if pkg in changeset: + del changeset[pkg] + continue @@ -57,3 +162,6 @@ Index: smart-1.4.1/smart/transaction.py elif op is REMOVE: self._remove(pkg, changeset, locked, pending) elif op is UPGRADE: +-- +1.8.4.2 + -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] python-smartpm: really ignore conflicts during install with --attempt 2014-02-06 13:39 [PATCH] python-smartpm: really ignore conflicts during install with --attempt Paul Eggleton @ 2014-02-09 23:25 ` Richard Purdie 2014-02-10 5:37 ` Laurentiu Palcu 0 siblings, 1 reply; 6+ messages in thread From: Richard Purdie @ 2014-02-09 23:25 UTC (permalink / raw) To: Paul Eggleton, Laurentiu Palcu; +Cc: openembedded-core On Thu, 2014-02-06 at 13:39 +0000, Paul Eggleton wrote: > The original patch added in OE-Core commit > bdf07b1698d228dc7ff555199a269b1ff8ceca19 was supposed to ignore > conflicts, but it was unable to do so because it wasn't raising errors > in the right place. When the --attempt option is used (as is done in > complementary package installation for RPM), raise errors immediately > on conflicts, catch errors at the right point so that requested packages > and their dependencies can be ignored, and print appropriate warnings > when doing so. > > Fixes [YOCTO #5313]. > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> > --- > .../python/python-smartpm/smart-attempt.patch | 134 +++++++++++++++++++-- > 1 file changed, 121 insertions(+), 13 deletions(-) Could you take a look at: http://autobuilder.yoctoproject.org/main/builders/nightly-multilib/builds/22 please? I've not 100% confirmed it was this change, it could be something else (e.g. Laurentiu's rootfs changes) but something in master-next broke multilib :/ Cheers, Richard > diff --git a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch > index 0d603d3..1136182 100644 > --- a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch > +++ b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch > @@ -1,18 +1,27 @@ > -Add a mechanism to attempt the install operation, w/o failing. > +From 7ee23804a06f81476cc2b31a6db11b52d7af764e Mon Sep 17 00:00:00 2001 > +From: Mark Hatle <mark.hatle@windriver.com> > +Date: Mon, 20 Jan 2014 14:30:52 +0000 > +Subject: [PATCH] Add mechanism to attempt install without failing > > -For complementary and 'attemptonly' packages, we need a way to instruct smart to > -try to install, but ignore any failures. > +In OpenEmbedded, for complementary and 'attemptonly' package processing, > +we need a way to instruct smart to try to install, but ignore any > +failures (usually conflicts). > > This option only works for the install operation. > > Upstream-Status: Pending > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> > +--- > + smart/commands/install.py | 5 ++++ > + smart/transaction.py | 65 +++++++++++++++++++++++++++++++++++------------ > + 2 files changed, 54 insertions(+), 16 deletions(-) > > -Index: smart-1.4.1/smart/commands/install.py > -=================================================================== > ---- smart-1.4.1.orig/smart/commands/install.py > -+++ smart-1.4.1/smart/commands/install.py > +diff --git a/smart/commands/install.py b/smart/commands/install.py > +index 590222c..6ef9682 100644 > +--- a/smart/commands/install.py > ++++ b/smart/commands/install.py > @@ -50,6 +50,8 @@ def option_parser(): > parser = OptionParser(usage=USAGE, > description=DESCRIPTION, > @@ -32,11 +41,106 @@ Index: smart-1.4.1/smart/commands/install.py > if opts.explain: > sysconf.set("explain-changesets", True, soft=True) > > -Index: smart-1.4.1/smart/transaction.py > -=================================================================== > ---- smart-1.4.1.orig/smart/transaction.py > -+++ smart-1.4.1/smart/transaction.py > -@@ -1216,9 +1216,17 @@ class Transaction(object): > +diff --git a/smart/transaction.py b/smart/transaction.py > +index 5730a42..e3e61c6 100644 > +--- a/smart/transaction.py > ++++ b/smart/transaction.py > +@@ -555,6 +555,8 @@ class Transaction(object): > + changeset.set(pkg, INSTALL) > + isinst = changeset.installed > + > ++ attempt = sysconf.has("attempt-install", soft=True) > ++ > + # Remove packages conflicted by this one. > + for cnf in pkg.conflicts: > + for prv in cnf.providedby: > +@@ -564,11 +566,16 @@ class Transaction(object): > + if not isinst(prvpkg): > + locked[prvpkg] = (LOCKED_CONFLICT_BY, pkg) > + continue > +- if prvpkg in locked: > +- raise Failed, _("Can't install %s: conflicted package " > +- "%s is locked") % (pkg, prvpkg) > +- self._remove(prvpkg, changeset, locked, pending, depth) > +- pending.append((PENDING_UPDOWN, prvpkg)) > ++ if attempt: > ++ del changeset[pkg] > ++ raise Failed, _("Can't install %s: it conflicts with package " > ++ "%s") % (pkg, prvpkg) > ++ else: > ++ if prvpkg in locked: > ++ raise Failed, _("Can't install %s: conflicted package " > ++ "%s is locked") % (pkg, prvpkg) > ++ self._remove(prvpkg, changeset, locked, pending, depth) > ++ pending.append((PENDING_UPDOWN, prvpkg)) > + > + # Remove packages conflicting with this one. > + for prv in pkg.provides: > +@@ -579,12 +586,18 @@ class Transaction(object): > + if not isinst(cnfpkg): > + locked[cnfpkg] = (LOCKED_CONFLICT, pkg) > + continue > +- if cnfpkg in locked: > ++ if attempt: > ++ del changeset[pkg] > + raise Failed, _("Can't install %s: it's conflicted by " > +- "the locked package %s") \ > +- % (pkg, cnfpkg) > +- self._remove(cnfpkg, changeset, locked, pending, depth) > +- pending.append((PENDING_UPDOWN, cnfpkg)) > ++ "the package %s") \ > ++ % (pkg, cnfpkg) > ++ else: > ++ if cnfpkg in locked: > ++ raise Failed, _("Can't install %s: it's conflicted by " > ++ "the locked package %s") \ > ++ % (pkg, cnfpkg) > ++ self._remove(cnfpkg, changeset, locked, pending, depth) > ++ pending.append((PENDING_UPDOWN, cnfpkg)) > + > + # Remove packages with the same name that can't > + # coexist with this one. > +@@ -594,10 +607,15 @@ class Transaction(object): > + if not isinst(namepkg): > + locked[namepkg] = (LOCKED_NO_COEXIST, pkg) > + continue > +- if namepkg in locked: > ++ if attempt: > ++ del changeset[pkg] > + raise Failed, _("Can't install %s: it can't coexist " > + "with %s") % (pkg, namepkg) > +- self._remove(namepkg, changeset, locked, pending, depth) > ++ else: > ++ if namepkg in locked: > ++ raise Failed, _("Can't install %s: it can't coexist " > ++ "with %s") % (pkg, namepkg) > ++ self._remove(namepkg, changeset, locked, pending, depth) > + > + # Install packages required by this one. > + for req in pkg.requires + pkg.recommends: > +@@ -1176,6 +1194,8 @@ class Transaction(object): > + > + self._policy.runStarting() > + > ++ attempt = sysconf.has("attempt-install", soft=True) > ++ > + try: > + changeset = self._changeset.copy() > + isinst = changeset.installed > +@@ -1190,7 +1210,11 @@ class Transaction(object): > + locked[pkg] = (LOCKED_KEEP, None) > + elif op is INSTALL: > + if not isinst(pkg) and pkg in locked: > +- raise Failed, _("Can't install %s: it's locked") % pkg > ++ if attempt: > ++ iface.warning(_("Can't install %s: it's locked") % pkg) > ++ del changeset[pkg] > ++ else: > ++ raise Failed, _("Can't install %s: it's locked") % pkg > + changeset.set(pkg, INSTALL) > + locked[pkg] = (LOCKED_INSTALL, None) > + elif op is REMOVE: > +@@ -1216,9 +1240,18 @@ class Transaction(object): > else: > op = REMOVE > if op is INSTALL or op is REINSTALL: > @@ -48,7 +152,8 @@ Index: smart-1.4.1/smart/transaction.py > + if pkg in changeset: > + changeset.setRequested(pkg, True) > + except Failed, e: > -+ if sysconf.has("attempt-install", soft=True): > ++ if attempt: > ++ iface.warning(_("Can't install %s: %s") % (pkg, e)) > + if pkg in changeset: > + del changeset[pkg] > + continue > @@ -57,3 +162,6 @@ Index: smart-1.4.1/smart/transaction.py > elif op is REMOVE: > self._remove(pkg, changeset, locked, pending) > elif op is UPGRADE: > +-- > +1.8.4.2 > + ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] python-smartpm: really ignore conflicts during install with --attempt 2014-02-09 23:25 ` Richard Purdie @ 2014-02-10 5:37 ` Laurentiu Palcu 2014-02-10 7:59 ` Laurentiu Palcu 0 siblings, 1 reply; 6+ messages in thread From: Laurentiu Palcu @ 2014-02-10 5:37 UTC (permalink / raw) To: Richard Purdie; +Cc: Paul Eggleton, openembedded-core On Sun, Feb 09, 2014 at 11:25:11PM +0000, Richard Purdie wrote: > On Thu, 2014-02-06 at 13:39 +0000, Paul Eggleton wrote: > > The original patch added in OE-Core commit > > bdf07b1698d228dc7ff555199a269b1ff8ceca19 was supposed to ignore > > conflicts, but it was unable to do so because it wasn't raising errors > > in the right place. When the --attempt option is used (as is done in > > complementary package installation for RPM), raise errors immediately > > on conflicts, catch errors at the right point so that requested packages > > and their dependencies can be ignored, and print appropriate warnings > > when doing so. > > > > Fixes [YOCTO #5313]. > > > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> > > --- > > .../python/python-smartpm/smart-attempt.patch | 134 +++++++++++++++++++-- > > 1 file changed, 121 insertions(+), 13 deletions(-) > > Could you take a look at: > > http://autobuilder.yoctoproject.org/main/builders/nightly-multilib/builds/22 > > please? > > I've not 100% confirmed it was this change, it could be something else > (e.g. Laurentiu's rootfs changes) but something in master-next broke > multilib :/ I'll do a build locally with your master-next changes and see what happens. At first sight, it looks like an issue with the rootfs changes. However, 'smart channel --add' is not the command I was expecting to fail... laurentiu > > Cheers, > > Richard > > > > diff --git a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch > > index 0d603d3..1136182 100644 > > --- a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch > > +++ b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch > > @@ -1,18 +1,27 @@ > > -Add a mechanism to attempt the install operation, w/o failing. > > +From 7ee23804a06f81476cc2b31a6db11b52d7af764e Mon Sep 17 00:00:00 2001 > > +From: Mark Hatle <mark.hatle@windriver.com> > > +Date: Mon, 20 Jan 2014 14:30:52 +0000 > > +Subject: [PATCH] Add mechanism to attempt install without failing > > > > -For complementary and 'attemptonly' packages, we need a way to instruct smart to > > -try to install, but ignore any failures. > > +In OpenEmbedded, for complementary and 'attemptonly' package processing, > > +we need a way to instruct smart to try to install, but ignore any > > +failures (usually conflicts). > > > > This option only works for the install operation. > > > > Upstream-Status: Pending > > > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > > +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> > > +--- > > + smart/commands/install.py | 5 ++++ > > + smart/transaction.py | 65 +++++++++++++++++++++++++++++++++++------------ > > + 2 files changed, 54 insertions(+), 16 deletions(-) > > > > -Index: smart-1.4.1/smart/commands/install.py > > -=================================================================== > > ---- smart-1.4.1.orig/smart/commands/install.py > > -+++ smart-1.4.1/smart/commands/install.py > > +diff --git a/smart/commands/install.py b/smart/commands/install.py > > +index 590222c..6ef9682 100644 > > +--- a/smart/commands/install.py > > ++++ b/smart/commands/install.py > > @@ -50,6 +50,8 @@ def option_parser(): > > parser = OptionParser(usage=USAGE, > > description=DESCRIPTION, > > @@ -32,11 +41,106 @@ Index: smart-1.4.1/smart/commands/install.py > > if opts.explain: > > sysconf.set("explain-changesets", True, soft=True) > > > > -Index: smart-1.4.1/smart/transaction.py > > -=================================================================== > > ---- smart-1.4.1.orig/smart/transaction.py > > -+++ smart-1.4.1/smart/transaction.py > > -@@ -1216,9 +1216,17 @@ class Transaction(object): > > +diff --git a/smart/transaction.py b/smart/transaction.py > > +index 5730a42..e3e61c6 100644 > > +--- a/smart/transaction.py > > ++++ b/smart/transaction.py > > +@@ -555,6 +555,8 @@ class Transaction(object): > > + changeset.set(pkg, INSTALL) > > + isinst = changeset.installed > > + > > ++ attempt = sysconf.has("attempt-install", soft=True) > > ++ > > + # Remove packages conflicted by this one. > > + for cnf in pkg.conflicts: > > + for prv in cnf.providedby: > > +@@ -564,11 +566,16 @@ class Transaction(object): > > + if not isinst(prvpkg): > > + locked[prvpkg] = (LOCKED_CONFLICT_BY, pkg) > > + continue > > +- if prvpkg in locked: > > +- raise Failed, _("Can't install %s: conflicted package " > > +- "%s is locked") % (pkg, prvpkg) > > +- self._remove(prvpkg, changeset, locked, pending, depth) > > +- pending.append((PENDING_UPDOWN, prvpkg)) > > ++ if attempt: > > ++ del changeset[pkg] > > ++ raise Failed, _("Can't install %s: it conflicts with package " > > ++ "%s") % (pkg, prvpkg) > > ++ else: > > ++ if prvpkg in locked: > > ++ raise Failed, _("Can't install %s: conflicted package " > > ++ "%s is locked") % (pkg, prvpkg) > > ++ self._remove(prvpkg, changeset, locked, pending, depth) > > ++ pending.append((PENDING_UPDOWN, prvpkg)) > > + > > + # Remove packages conflicting with this one. > > + for prv in pkg.provides: > > +@@ -579,12 +586,18 @@ class Transaction(object): > > + if not isinst(cnfpkg): > > + locked[cnfpkg] = (LOCKED_CONFLICT, pkg) > > + continue > > +- if cnfpkg in locked: > > ++ if attempt: > > ++ del changeset[pkg] > > + raise Failed, _("Can't install %s: it's conflicted by " > > +- "the locked package %s") \ > > +- % (pkg, cnfpkg) > > +- self._remove(cnfpkg, changeset, locked, pending, depth) > > +- pending.append((PENDING_UPDOWN, cnfpkg)) > > ++ "the package %s") \ > > ++ % (pkg, cnfpkg) > > ++ else: > > ++ if cnfpkg in locked: > > ++ raise Failed, _("Can't install %s: it's conflicted by " > > ++ "the locked package %s") \ > > ++ % (pkg, cnfpkg) > > ++ self._remove(cnfpkg, changeset, locked, pending, depth) > > ++ pending.append((PENDING_UPDOWN, cnfpkg)) > > + > > + # Remove packages with the same name that can't > > + # coexist with this one. > > +@@ -594,10 +607,15 @@ class Transaction(object): > > + if not isinst(namepkg): > > + locked[namepkg] = (LOCKED_NO_COEXIST, pkg) > > + continue > > +- if namepkg in locked: > > ++ if attempt: > > ++ del changeset[pkg] > > + raise Failed, _("Can't install %s: it can't coexist " > > + "with %s") % (pkg, namepkg) > > +- self._remove(namepkg, changeset, locked, pending, depth) > > ++ else: > > ++ if namepkg in locked: > > ++ raise Failed, _("Can't install %s: it can't coexist " > > ++ "with %s") % (pkg, namepkg) > > ++ self._remove(namepkg, changeset, locked, pending, depth) > > + > > + # Install packages required by this one. > > + for req in pkg.requires + pkg.recommends: > > +@@ -1176,6 +1194,8 @@ class Transaction(object): > > + > > + self._policy.runStarting() > > + > > ++ attempt = sysconf.has("attempt-install", soft=True) > > ++ > > + try: > > + changeset = self._changeset.copy() > > + isinst = changeset.installed > > +@@ -1190,7 +1210,11 @@ class Transaction(object): > > + locked[pkg] = (LOCKED_KEEP, None) > > + elif op is INSTALL: > > + if not isinst(pkg) and pkg in locked: > > +- raise Failed, _("Can't install %s: it's locked") % pkg > > ++ if attempt: > > ++ iface.warning(_("Can't install %s: it's locked") % pkg) > > ++ del changeset[pkg] > > ++ else: > > ++ raise Failed, _("Can't install %s: it's locked") % pkg > > + changeset.set(pkg, INSTALL) > > + locked[pkg] = (LOCKED_INSTALL, None) > > + elif op is REMOVE: > > +@@ -1216,9 +1240,18 @@ class Transaction(object): > > else: > > op = REMOVE > > if op is INSTALL or op is REINSTALL: > > @@ -48,7 +152,8 @@ Index: smart-1.4.1/smart/transaction.py > > + if pkg in changeset: > > + changeset.setRequested(pkg, True) > > + except Failed, e: > > -+ if sysconf.has("attempt-install", soft=True): > > ++ if attempt: > > ++ iface.warning(_("Can't install %s: %s") % (pkg, e)) > > + if pkg in changeset: > > + del changeset[pkg] > > + continue > > @@ -57,3 +162,6 @@ Index: smart-1.4.1/smart/transaction.py > > elif op is REMOVE: > > self._remove(pkg, changeset, locked, pending) > > elif op is UPGRADE: > > +-- > > +1.8.4.2 > > + > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] python-smartpm: really ignore conflicts during install with --attempt 2014-02-10 5:37 ` Laurentiu Palcu @ 2014-02-10 7:59 ` Laurentiu Palcu 2014-02-10 10:01 ` Paul Eggleton 0 siblings, 1 reply; 6+ messages in thread From: Laurentiu Palcu @ 2014-02-10 7:59 UTC (permalink / raw) To: Richard Purdie; +Cc: Paul Eggleton, openembedded-core On Mon, Feb 10, 2014 at 07:37:12AM +0200, Laurentiu Palcu wrote: > On Sun, Feb 09, 2014 at 11:25:11PM +0000, Richard Purdie wrote: > > On Thu, 2014-02-06 at 13:39 +0000, Paul Eggleton wrote: > > > The original patch added in OE-Core commit > > > bdf07b1698d228dc7ff555199a269b1ff8ceca19 was supposed to ignore > > > conflicts, but it was unable to do so because it wasn't raising errors > > > in the right place. When the --attempt option is used (as is done in > > > complementary package installation for RPM), raise errors immediately > > > on conflicts, catch errors at the right point so that requested packages > > > and their dependencies can be ignored, and print appropriate warnings > > > when doing so. > > > > > > Fixes [YOCTO #5313]. > > > > > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> > > > --- > > > .../python/python-smartpm/smart-attempt.patch | 134 +++++++++++++++++++-- > > > 1 file changed, 121 insertions(+), 13 deletions(-) > > > > Could you take a look at: > > > > http://autobuilder.yoctoproject.org/main/builders/nightly-multilib/builds/22 > > > > please? > > > > I've not 100% confirmed it was this change, it could be something else > > (e.g. Laurentiu's rootfs changes) but something in master-next broke > > multilib :/ > I'll do a build locally with your master-next changes and see what > happens. At first sight, it looks like an issue with the rootfs > changes. However, 'smart channel --add' is not the command I was > expecting to fail... I pushed a fix on poky-contrib:lpalcu/rootfs_refactoring_ship_oecore lib/oe/package_manager.py: RpmPM: fix issue with multilib builds laurentiu > > laurentiu > > > > Cheers, > > > > Richard > > > > > > > diff --git a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch > > > index 0d603d3..1136182 100644 > > > --- a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch > > > +++ b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch > > > @@ -1,18 +1,27 @@ > > > -Add a mechanism to attempt the install operation, w/o failing. > > > +From 7ee23804a06f81476cc2b31a6db11b52d7af764e Mon Sep 17 00:00:00 2001 > > > +From: Mark Hatle <mark.hatle@windriver.com> > > > +Date: Mon, 20 Jan 2014 14:30:52 +0000 > > > +Subject: [PATCH] Add mechanism to attempt install without failing > > > > > > -For complementary and 'attemptonly' packages, we need a way to instruct smart to > > > -try to install, but ignore any failures. > > > +In OpenEmbedded, for complementary and 'attemptonly' package processing, > > > +we need a way to instruct smart to try to install, but ignore any > > > +failures (usually conflicts). > > > > > > This option only works for the install operation. > > > > > > Upstream-Status: Pending > > > > > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > > > +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> > > > +--- > > > + smart/commands/install.py | 5 ++++ > > > + smart/transaction.py | 65 +++++++++++++++++++++++++++++++++++------------ > > > + 2 files changed, 54 insertions(+), 16 deletions(-) > > > > > > -Index: smart-1.4.1/smart/commands/install.py > > > -=================================================================== > > > ---- smart-1.4.1.orig/smart/commands/install.py > > > -+++ smart-1.4.1/smart/commands/install.py > > > +diff --git a/smart/commands/install.py b/smart/commands/install.py > > > +index 590222c..6ef9682 100644 > > > +--- a/smart/commands/install.py > > > ++++ b/smart/commands/install.py > > > @@ -50,6 +50,8 @@ def option_parser(): > > > parser = OptionParser(usage=USAGE, > > > description=DESCRIPTION, > > > @@ -32,11 +41,106 @@ Index: smart-1.4.1/smart/commands/install.py > > > if opts.explain: > > > sysconf.set("explain-changesets", True, soft=True) > > > > > > -Index: smart-1.4.1/smart/transaction.py > > > -=================================================================== > > > ---- smart-1.4.1.orig/smart/transaction.py > > > -+++ smart-1.4.1/smart/transaction.py > > > -@@ -1216,9 +1216,17 @@ class Transaction(object): > > > +diff --git a/smart/transaction.py b/smart/transaction.py > > > +index 5730a42..e3e61c6 100644 > > > +--- a/smart/transaction.py > > > ++++ b/smart/transaction.py > > > +@@ -555,6 +555,8 @@ class Transaction(object): > > > + changeset.set(pkg, INSTALL) > > > + isinst = changeset.installed > > > + > > > ++ attempt = sysconf.has("attempt-install", soft=True) > > > ++ > > > + # Remove packages conflicted by this one. > > > + for cnf in pkg.conflicts: > > > + for prv in cnf.providedby: > > > +@@ -564,11 +566,16 @@ class Transaction(object): > > > + if not isinst(prvpkg): > > > + locked[prvpkg] = (LOCKED_CONFLICT_BY, pkg) > > > + continue > > > +- if prvpkg in locked: > > > +- raise Failed, _("Can't install %s: conflicted package " > > > +- "%s is locked") % (pkg, prvpkg) > > > +- self._remove(prvpkg, changeset, locked, pending, depth) > > > +- pending.append((PENDING_UPDOWN, prvpkg)) > > > ++ if attempt: > > > ++ del changeset[pkg] > > > ++ raise Failed, _("Can't install %s: it conflicts with package " > > > ++ "%s") % (pkg, prvpkg) > > > ++ else: > > > ++ if prvpkg in locked: > > > ++ raise Failed, _("Can't install %s: conflicted package " > > > ++ "%s is locked") % (pkg, prvpkg) > > > ++ self._remove(prvpkg, changeset, locked, pending, depth) > > > ++ pending.append((PENDING_UPDOWN, prvpkg)) > > > + > > > + # Remove packages conflicting with this one. > > > + for prv in pkg.provides: > > > +@@ -579,12 +586,18 @@ class Transaction(object): > > > + if not isinst(cnfpkg): > > > + locked[cnfpkg] = (LOCKED_CONFLICT, pkg) > > > + continue > > > +- if cnfpkg in locked: > > > ++ if attempt: > > > ++ del changeset[pkg] > > > + raise Failed, _("Can't install %s: it's conflicted by " > > > +- "the locked package %s") \ > > > +- % (pkg, cnfpkg) > > > +- self._remove(cnfpkg, changeset, locked, pending, depth) > > > +- pending.append((PENDING_UPDOWN, cnfpkg)) > > > ++ "the package %s") \ > > > ++ % (pkg, cnfpkg) > > > ++ else: > > > ++ if cnfpkg in locked: > > > ++ raise Failed, _("Can't install %s: it's conflicted by " > > > ++ "the locked package %s") \ > > > ++ % (pkg, cnfpkg) > > > ++ self._remove(cnfpkg, changeset, locked, pending, depth) > > > ++ pending.append((PENDING_UPDOWN, cnfpkg)) > > > + > > > + # Remove packages with the same name that can't > > > + # coexist with this one. > > > +@@ -594,10 +607,15 @@ class Transaction(object): > > > + if not isinst(namepkg): > > > + locked[namepkg] = (LOCKED_NO_COEXIST, pkg) > > > + continue > > > +- if namepkg in locked: > > > ++ if attempt: > > > ++ del changeset[pkg] > > > + raise Failed, _("Can't install %s: it can't coexist " > > > + "with %s") % (pkg, namepkg) > > > +- self._remove(namepkg, changeset, locked, pending, depth) > > > ++ else: > > > ++ if namepkg in locked: > > > ++ raise Failed, _("Can't install %s: it can't coexist " > > > ++ "with %s") % (pkg, namepkg) > > > ++ self._remove(namepkg, changeset, locked, pending, depth) > > > + > > > + # Install packages required by this one. > > > + for req in pkg.requires + pkg.recommends: > > > +@@ -1176,6 +1194,8 @@ class Transaction(object): > > > + > > > + self._policy.runStarting() > > > + > > > ++ attempt = sysconf.has("attempt-install", soft=True) > > > ++ > > > + try: > > > + changeset = self._changeset.copy() > > > + isinst = changeset.installed > > > +@@ -1190,7 +1210,11 @@ class Transaction(object): > > > + locked[pkg] = (LOCKED_KEEP, None) > > > + elif op is INSTALL: > > > + if not isinst(pkg) and pkg in locked: > > > +- raise Failed, _("Can't install %s: it's locked") % pkg > > > ++ if attempt: > > > ++ iface.warning(_("Can't install %s: it's locked") % pkg) > > > ++ del changeset[pkg] > > > ++ else: > > > ++ raise Failed, _("Can't install %s: it's locked") % pkg > > > + changeset.set(pkg, INSTALL) > > > + locked[pkg] = (LOCKED_INSTALL, None) > > > + elif op is REMOVE: > > > +@@ -1216,9 +1240,18 @@ class Transaction(object): > > > else: > > > op = REMOVE > > > if op is INSTALL or op is REINSTALL: > > > @@ -48,7 +152,8 @@ Index: smart-1.4.1/smart/transaction.py > > > + if pkg in changeset: > > > + changeset.setRequested(pkg, True) > > > + except Failed, e: > > > -+ if sysconf.has("attempt-install", soft=True): > > > ++ if attempt: > > > ++ iface.warning(_("Can't install %s: %s") % (pkg, e)) > > > + if pkg in changeset: > > > + del changeset[pkg] > > > + continue > > > @@ -57,3 +162,6 @@ Index: smart-1.4.1/smart/transaction.py > > > elif op is REMOVE: > > > self._remove(pkg, changeset, locked, pending) > > > elif op is UPGRADE: > > > +-- > > > +1.8.4.2 > > > + > > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] python-smartpm: really ignore conflicts during install with --attempt 2014-02-10 7:59 ` Laurentiu Palcu @ 2014-02-10 10:01 ` Paul Eggleton 2014-02-10 10:54 ` Laurentiu Palcu 0 siblings, 1 reply; 6+ messages in thread From: Paul Eggleton @ 2014-02-10 10:01 UTC (permalink / raw) To: Laurentiu Palcu; +Cc: Richard Purdie, openembedded-core On Monday 10 February 2014 09:59:49 Laurentiu Palcu wrote: > On Mon, Feb 10, 2014 at 07:37:12AM +0200, Laurentiu Palcu wrote: > > On Sun, Feb 09, 2014 at 11:25:11PM +0000, Richard Purdie wrote: > > > On Thu, 2014-02-06 at 13:39 +0000, Paul Eggleton wrote: > > > > The original patch added in OE-Core commit > > > > bdf07b1698d228dc7ff555199a269b1ff8ceca19 was supposed to ignore > > > > conflicts, but it was unable to do so because it wasn't raising errors > > > > in the right place. When the --attempt option is used (as is done in > > > > complementary package installation for RPM), raise errors immediately > > > > on conflicts, catch errors at the right point so that requested > > > > packages > > > > and their dependencies can be ignored, and print appropriate warnings > > > > when doing so. > > > > > > > > Fixes [YOCTO #5313]. > > > > > > > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> > > > > --- > > > > > > > > .../python/python-smartpm/smart-attempt.patch | 134 > > > > +++++++++++++++++++-- 1 file changed, 121 insertions(+), 13 > > > > deletions(-) > > > > > > Could you take a look at: > > > > > > http://autobuilder.yoctoproject.org/main/builders/nightly-multilib/build > > > s/22 > > > > > > please? > > > > > > I've not 100% confirmed it was this change, it could be something else > > > (e.g. Laurentiu's rootfs changes) but something in master-next broke > > > multilib :/ > > > > I'll do a build locally with your master-next changes and see what > > happens. At first sight, it looks like an issue with the rootfs > > changes. However, 'smart channel --add' is not the command I was > > expecting to fail... > > I pushed a fix on poky-contrib:lpalcu/rootfs_refactoring_ship_oecore > > lib/oe/package_manager.py: RpmPM: fix issue with multilib builds The lack of detail in the error message is a little bit concerning - we're not getting the output from smart in the log, so other than the return value it's hard to determine what might have gone wrong. Is this something that could be fixed as well? Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] python-smartpm: really ignore conflicts during install with --attempt 2014-02-10 10:01 ` Paul Eggleton @ 2014-02-10 10:54 ` Laurentiu Palcu 0 siblings, 0 replies; 6+ messages in thread From: Laurentiu Palcu @ 2014-02-10 10:54 UTC (permalink / raw) To: Paul Eggleton; +Cc: Richard Purdie, openembedded-core On Mon, Feb 10, 2014 at 10:01:32AM +0000, Paul Eggleton wrote: > On Monday 10 February 2014 09:59:49 Laurentiu Palcu wrote: > > On Mon, Feb 10, 2014 at 07:37:12AM +0200, Laurentiu Palcu wrote: > > > On Sun, Feb 09, 2014 at 11:25:11PM +0000, Richard Purdie wrote: > > > > On Thu, 2014-02-06 at 13:39 +0000, Paul Eggleton wrote: > > > > > The original patch added in OE-Core commit > > > > > bdf07b1698d228dc7ff555199a269b1ff8ceca19 was supposed to ignore > > > > > conflicts, but it was unable to do so because it wasn't raising errors > > > > > in the right place. When the --attempt option is used (as is done in > > > > > complementary package installation for RPM), raise errors immediately > > > > > on conflicts, catch errors at the right point so that requested > > > > > packages > > > > > and their dependencies can be ignored, and print appropriate warnings > > > > > when doing so. > > > > > > > > > > Fixes [YOCTO #5313]. > > > > > > > > > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> > > > > > --- > > > > > > > > > > .../python/python-smartpm/smart-attempt.patch | 134 > > > > > +++++++++++++++++++-- 1 file changed, 121 insertions(+), 13 > > > > > deletions(-) > > > > > > > > Could you take a look at: > > > > > > > > http://autobuilder.yoctoproject.org/main/builders/nightly-multilib/build > > > > s/22 > > > > > > > > please? > > > > > > > > I've not 100% confirmed it was this change, it could be something else > > > > (e.g. Laurentiu's rootfs changes) but something in master-next broke > > > > multilib :/ > > > > > > I'll do a build locally with your master-next changes and see what > > > happens. At first sight, it looks like an issue with the rootfs > > > changes. However, 'smart channel --add' is not the command I was > > > expecting to fail... > > > > I pushed a fix on poky-contrib:lpalcu/rootfs_refactoring_ship_oecore > > > > lib/oe/package_manager.py: RpmPM: fix issue with multilib builds > > The lack of detail in the error message is a little bit concerning - we're not > getting the output from smart in the log, so other than the return value it's > hard to determine what might have gone wrong. Is this something that could be > fixed as well? Sure, I'll prepare another patch that will print all the errors in the log. laurentiu > > Cheers, > Paul > > -- > > Paul Eggleton > Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-02-10 10:54 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-02-06 13:39 [PATCH] python-smartpm: really ignore conflicts during install with --attempt Paul Eggleton 2014-02-09 23:25 ` Richard Purdie 2014-02-10 5:37 ` Laurentiu Palcu 2014-02-10 7:59 ` Laurentiu Palcu 2014-02-10 10:01 ` Paul Eggleton 2014-02-10 10:54 ` Laurentiu Palcu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox