summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2013-04-11 09:58:42 -0700
committerAnas Nashif <anas.nashif@intel.com>2013-04-11 09:58:42 -0700
commit524f855df0f94933f1078098800c0a93a7f8e86e (patch)
tree57d0a22bddda2e6684160069ca8609198863c7de /tools
parentda5983eb19fa9aa677fde925fdbd8e6d1f8f000a (diff)
downloadlibsolv-524f855df0f94933f1078098800c0a93a7f8e86e.tar.gz
libsolv-524f855df0f94933f1078098800c0a93a7f8e86e.tar.bz2
libsolv-524f855df0f94933f1078098800c0a93a7f8e86e.zip
merged 0.3.0
Diffstat (limited to 'tools')
-rw-r--r--tools/common_write.c2
-rw-r--r--tools/installcheck.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/common_write.c b/tools/common_write.c
index 75c75b5..6de8a69 100644
--- a/tools/common_write.c
+++ b/tools/common_write.c
@@ -27,6 +27,8 @@ static Id verticals[] = {
SOLVABLE_EULA,
SOLVABLE_DISKUSAGE,
SOLVABLE_FILELIST,
+ SOLVABLE_CHANGELOG_AUTHOR,
+ SOLVABLE_CHANGELOG_TEXT,
0
};
diff --git a/tools/installcheck.c b/tools/installcheck.c
index 4859bc2..a0513ea 100644
--- a/tools/installcheck.c
+++ b/tools/installcheck.c
@@ -250,10 +250,11 @@ main(int argc, char **argv)
}
}
+ solv = solver_create(pool);
+
/* prune cand by doing weak installs */
while (cand.count)
{
- solv = solver_create(pool);
queue_empty(&job);
for (i = 0; i < cand.count; i++)
{
@@ -326,7 +327,6 @@ main(int argc, char **argv)
continue;
}
s = pool->solvables + p;
- solv = solver_create(pool);
queue_empty(&job);
queue_push(&job, SOLVER_INSTALL|SOLVER_SOLVABLE);
queue_push(&job, p);
@@ -442,7 +442,7 @@ main(int argc, char **argv)
}
}
#endif
- solver_free(solv);
}
+ solver_free(solv);
exit(status);
}