Thanks Danek for review.
I will backout the CR 7111616. Checking with Martin about it.
The fix for CR 7157309 only is as below :
diff -r bd1b1e556984 -r c81b1ec72fef src/modules/client/pkg_solver.py
--- a/src/modules/client/pkg_solver.py Fri Apr 06 15:45:43 2012 -0700
+++ b/src/modules/client/pkg_solver.py Tue Apr 17 11:59:00 2012 +0530
@@ -2089,14 +2089,14 @@
installed = self.__root_fmris.get(
req_fmri.pkg_name, None)
reason = (N_("Installed version in
root image "
- "is too old for origin dependency %s"),
+ "is too old for origin dependency
{0}"),
(req_fmri,))
else:
installed = self.__installed_dict.get(
req_fmri.pkg_name, None)
reason = (N_("Installed version in image "
"being upgraded is too old for
origin "
- "dependency %s"), (req_fmri,))
+ "dependency {0}"), (req_fmri,))
# assumption is that for root-image,
publishers align;
# otherwise these sorts of cross-environment
I have attached the patch for CR 7157309.
Could you please integrate it.
Abhi.
On 04/14/12 02:50, Danek Duvall wrote:
The fix for 7157309 is fine, but I'm not sure I understand the problem
described by 7111616. What's misleading about the double message? And
neither message has as much information as the two of them put together, so
dumping either one seems like a loss. You could always follow Martin's
second suggestion, but testing for existence is always a risky proposition.
Can you get in touch with Martin and find out what the problem is here?
Also, please don't forget to update the bug status appropriately while
you're working on them.
Thanks,
Danek
--
Oracle
Abhinandan Ekande
Solaris Install,
Revenue Product Engineering (RPE), Systems
Phone: +91 8041847267 | Fax: +91 80 22231794 | Mobile: +91 9632144088
ORACLE India | Off Langford Road | Bangalore | 560025
Green Oracle <http://www.oracle.com/commitment> Oracle is committed to
developing practices and products that help protect the environment
# HG changeset patch
# User [email protected]
# Date 1334644140 -19800
# Node ID c81b1ec72fef5af1a8ccbdf30299c254de20d1ef
# Parent bd1b1e5569841e5e9ccf34ba94bb22f1c891e6b5
7157309 origin dependency error message is using the wrong type of format
specifier
diff -r bd1b1e556984 -r c81b1ec72fef src/modules/client/pkg_solver.py
--- a/src/modules/client/pkg_solver.py Fri Apr 06 15:45:43 2012 -0700
+++ b/src/modules/client/pkg_solver.py Tue Apr 17 11:59:00 2012 +0530
@@ -2089,14 +2089,14 @@
installed = self.__root_fmris.get(
req_fmri.pkg_name, None)
reason = (N_("Installed version in root image "
- "is too old for origin dependency %s"),
+ "is too old for origin dependency {0}"),
(req_fmri,))
else:
installed = self.__installed_dict.get(
req_fmri.pkg_name, None)
reason = (N_("Installed version in image "
"being upgraded is too old for origin "
- "dependency %s"), (req_fmri,))
+ "dependency {0}"), (req_fmri,))
# assumption is that for root-image, publishers align;
# otherwise these sorts of cross-environment
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
