Mailinglist Archive: yast-commit (2114 mails)

< Previous Next >
[yast-commit] r58762 - in /trunk/gtk: ChangeLog src/yzyppwrapper.cc
  • From: rpmcruz@xxxxxxxxxxxxxxxx
  • Date: Thu, 24 Sep 2009 20:47:22 -0000
  • Message-id: <E1MqvDm-0001EE-5H@xxxxxxxxxxxxxxxx>
Author: rpmcruz
Date: Thu Sep 24 22:47:21 2009
New Revision: 58762

URL: http://svn.opensuse.org/viewcvs/yast?rev=58762&view=rev
Log:
* src/yzyppwrapper.cc: made compilable for 11.1 libzypp
version 5.24.5.

Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/yzyppwrapper.cc

Modified: trunk/gtk/ChangeLog
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=58762&r1=58761&r2=58762&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Thu Sep 24 22:47:21 2009
@@ -1,5 +1,10 @@
2009-09-24 Ricardo Cruz <rpmcruz@xxxxxxxxxxxxxxxxxxx>

+ * src/yzyppwrapper.cc: made compilable for 11.1 libzypp
+ version 5.24.5.
+
+2009-09-24 Ricardo Cruz <rpmcruz@xxxxxxxxxxxxxxxxxxx>
+
* src/ygtkzyppview.cc: bug fix: pass USERNAME for gnomesu
not USER.


Modified: trunk/gtk/src/yzyppwrapper.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=58762&r1=58761&r2=58762&view=diff
==============================================================================
--- trunk/gtk/src/yzyppwrapper.cc (original)
+++ trunk/gtk/src/yzyppwrapper.cc Thu Sep 24 22:47:21 2009
@@ -624,9 +624,16 @@
if (rich) {
StringTree tree (strcmp, '/', NULL);

+#if ZYPP_VERSION > 5024005
for (zypp::Package::FileList::iterator it =
package->filelist().begin();
it != package->filelist().end(); it++)
tree.add (*it, "");
+#else
+ std::list <std::string> files
(package->filenames());
+ for (std::list <std::string>::iterator it =
files.begin();
+ it != files.end(); it++)
+ tree.add (*it, "");
+#endif

struct inner {
static std::string getPath (GNode *node)
@@ -676,9 +683,16 @@
inner::traverse, (void
*) &text);
}
else {
+#if ZYPP_VERSION > 5024005
for (zypp::Package::FileList::iterator it =
package->filelist().begin();
it != package->filelist().end(); it++)
text += *it + " ";
+#else
+ std::list <std::string> files
(package->filenames());
+ for (std::list <std::string>::iterator it =
files.begin();
+ it != files.end(); it++)
+ text += *it + " ";
+#endif
}
}
return text;

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages