Hello community,
here is the log from the commit of package yast2-snapper for openSUSE:Factory
checked in at Thu Oct 13 00:03:14 CEST 2011.
--------
--- openSUSE:Factory/yast2-snapper/yast2-snapper.changes 2011-10-11
17:08:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-snapper/yast2-snapper.changes
2011-10-12 16:45:30.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Oct 12 16:40:44 CEST 2011 - jsuch...@suse.cz
+
+- more optimalization in C++ code
+- use fixed font for showing the diff (bnc#723621)
+- escape HTML tags in diff output
+- 2.21.14
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-snapper-2.21.13.tar.bz2
New:
----
yast2-snapper-2.21.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-snapper.spec ++++++
--- /var/tmp/diff_new_pack.TRKUXD/_old 2011-10-13 00:03:10.000000000 +0200
+++ /var/tmp/diff_new_pack.TRKUXD/_new 2011-10-13 00:03:10.000000000 +0200
@@ -19,7 +19,7 @@
Name: yast2-snapper
-Version: 2.21.13
+Version: 2.21.14
Release: 0
Group: System/YaST
++++++ yast2-snapper-2.21.13.tar.bz2 -> yast2-snapper-2.21.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-snapper-2.21.13/VERSION
new/yast2-snapper-2.21.14/VERSION
--- old/yast2-snapper-2.21.13/VERSION 2011-10-10 12:45:23.000000000 +0200
+++ new/yast2-snapper-2.21.14/VERSION 2011-10-12 16:41:56.000000000 +0200
@@ -1 +1 @@
-2.21.13
+2.21.14
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-snapper-2.21.13/agent-snapper/src/SnapperAgent.cc
new/yast2-snapper-2.21.14/agent-snapper/src/SnapperAgent.cc
--- old/yast2-snapper-2.21.13/agent-snapper/src/SnapperAgent.cc 2011-10-10
12:43:23.000000000 +0200
+++ new/yast2-snapper-2.21.14/agent-snapper/src/SnapperAgent.cc 2011-10-12
16:05:09.000000000 +0200
@@ -18,11 +18,11 @@
/*
* search the map for value of given key; both key and value have to be strings
*/
-string SnapperAgent::getValue (const YCPMap &map, const string key, const
string deflt)
+string SnapperAgent::getValue (const YCPMap &map, const YCPString &key, const
string &deflt)
{
- if (!map->value(YCPString(key)).isNull()
- && map->value(YCPString(key))->isString())
- return map->value(YCPString(key))->asString()->value();
+ YCPValue val = map->value(key);
+ if (!val.isNull() && val->isString())
+ return val->asString()->value();
else
return deflt;
}
@@ -33,15 +33,15 @@
* @param key key we are looking for
* @param deflt the default value to be returned if key is not found
*/
-int SnapperAgent::getIntValue (const YCPMap &map, const string key, const int
deflt)
+int SnapperAgent::getIntValue (const YCPMap &map, const YCPString &key, const
int deflt)
{
- if (!map->value(YCPString(key)).isNull() &&
map->value(YCPString(key))->isInteger()) {
- return map->value(YCPString(key))->asInteger()->value();
+ YCPValue val = map->value(key);
+
+ if (!val.isNull() && val->isInteger()) {
+ return val->asInteger()->value();
}
- else if (!map->value(YCPString(key)).isNull() &&
- map->value(YCPString(key))->isString()) {
- YCPInteger i (map->value(YCPString(key))->asString()->value().c_str());
- return i->value();
+ else if (!val.isNull() && val->isString()) {
+ return YCPInteger (val->asString()->value().c_str())->value ();
}
return deflt;
}
@@ -50,10 +50,11 @@
* Search the map for value of given key;
* key is string and value is YCPList
*/
-YCPList SnapperAgent::getListValue (const YCPMap &map, const string key)
+YCPList SnapperAgent::getListValue (const YCPMap &map, const YCPString &key)
{
- if (!map->value(YCPString(key)).isNull() &&
map->value(YCPString(key))->isList())
- return map->value(YCPString(key))->asList();
+ YCPValue val = map->value(key);
+ if (!val.isNull() && val->isList())
+ return val->asList();
else
return YCPList();
}
@@ -155,7 +156,7 @@
* Read (.snapper.path, $[ "num" : num]) -> returns the path to
directory with given snapshot
*/
if (PC(0) == "path") {
- unsigned int num = getIntValue (argmap, "num", 0);
+ unsigned int num = getIntValue (argmap, YCPString ("num"), 0);
const Snapshots& snapshots = sh->getSnapshots();
Snapshots::const_iterator snap = snapshots.find(num);
if (snap == snapshots.end())
@@ -203,8 +204,8 @@
return retlist;
}
- unsigned int num1 = getIntValue (argmap, "from", 0);
- unsigned int num2 = getIntValue (argmap, "to", 0);
+ unsigned int num1 = getIntValue (argmap, YCPString ("from"), 0);
+ unsigned int num2 = getIntValue (argmap, YCPString ("to"), 0);
/**
* Read(.snapper.diff_list) -> show difference between snapnots num1
and num2 as list.
@@ -323,8 +324,7 @@
y2milestone ("deleting existing snapper object");
deleteSnapper(sh);
}
-
- string config_name = getValue (argmap, "config", "root");
+ string config_name = getValue (argmap, YCPString ("config"), "root");
try {
sh = createSnapper (config_name);
}
@@ -359,13 +359,13 @@
*/
if (PC(0) == "rollback") {
- unsigned int num1 = getIntValue (argmap, "from", 0);
- unsigned int num2 = getIntValue (argmap, "to", 0);
+ unsigned int num1 = getIntValue (argmap, YCPString ("from"), 0);
+ unsigned int num2 = getIntValue (argmap, YCPString ("to"), 0);
const Snapshots& snapshots = sh->getSnapshots();
Comparison comparison(sh, snapshots.find(num1),
snapshots.find(num2));
Files& files = comparison.getFiles();
- YCPList selected = getListValue (argmap, "files");
+ YCPList selected = getListValue (argmap, YCPString ("files"));
for (int i=0; i < selected->size(); i++) {
if (selected.value(i)->isString())
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-snapper-2.21.13/agent-snapper/src/SnapperAgent.h
new/yast2-snapper-2.21.14/agent-snapper/src/SnapperAgent.h
--- old/yast2-snapper-2.21.13/agent-snapper/src/SnapperAgent.h 2011-10-10
12:43:00.000000000 +0200
+++ new/yast2-snapper-2.21.14/agent-snapper/src/SnapperAgent.h 2011-10-12
16:05:12.000000000 +0200
@@ -37,7 +37,7 @@
* search the map for value of given key; both key and value have to be
strings
* when key is not present, default value is returned
*/
- string getValue (const YCPMap &map, const string key, const string deflt);
+ string getValue (const YCPMap &map, const YCPString &key, const string
&deflt);
/**
* Search the map for value of given key
@@ -45,13 +45,13 @@
* @param key key we are looking for
* @param deflt the default value to be returned if key is not found
*/
- int getIntValue ( const YCPMap &map, const string key, const int deflt);
+ int getIntValue ( const YCPMap &map, const YCPString &key, const int
deflt);
/**
* Search the map for value of given key;
* key is string and value is YCPList
*/
- YCPList getListValue (const YCPMap &map, const string key);
+ YCPList getListValue (const YCPMap &map, const YCPString &key);
public:
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-snapper-2.21.13/src/dialogs.ycp
new/yast2-snapper-2.21.14/src/dialogs.ycp
--- old/yast2-snapper-2.21.13/src/dialogs.ycp 2011-10-10 12:54:08.000000000
+0200
+++ new/yast2-snapper-2.21.14/src/dialogs.ycp 2011-10-12 16:39:49.000000000
+0200
@@ -24,7 +24,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Suchomel <jsuch...@suse.cz>
*
- * $Id: dialogs.ycp 66356 2011-10-10 10:54:07Z jsuchome $
+ * $Id: dialogs.ycp 66391 2011-10-12 11:10:04Z jsuchome $
*/
{
@@ -374,8 +374,10 @@
if (haskey (modification, "diff"))
{
- string diff = modification["diff"]:"";
+ string diff = String::EscapeTags (modification["diff"]:"");
diff = mergestring (splitstring (diff, "\n"), "<br>");
+ // show fixed font in diff
+ diff = "<tt>" + diff + "</tt>";
content = add (content, `RichText (`id (`diff), diff));
}
else
@@ -637,7 +639,7 @@
files = filter (string file, files, {
if (haskey (files_index, file))
{
- to_restore = add (to_restore, String::Quote
(Snapper::GetFileFullPath (file)));
+ to_restore = add (to_restore, String::EscapeTags
(Snapper::GetFileFullPath (file)));
return true;
}
else
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
