packages: poldek/poldek-show_only_relative_used_space.patch - thx to SamChi...
cactus
cactus at pld-linux.org
Thu Feb 4 23:24:25 CET 2010
Author: cactus Date: Thu Feb 4 22:24:25 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- thx to SamChi - small mod - if install freies space dont show take but free
---- Files affected:
packages/poldek:
poldek-show_only_relative_used_space.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/poldek/poldek-show_only_relative_used_space.patch
diff -u packages/poldek/poldek-show_only_relative_used_space.patch:1.1 packages/poldek/poldek-show_only_relative_used_space.patch:1.2
--- packages/poldek/poldek-show_only_relative_used_space.patch:1.1 Thu Feb 4 22:38:36 2010
+++ packages/poldek/poldek-show_only_relative_used_space.patch Thu Feb 4 23:24:20 2010
@@ -15,7 +15,7 @@
msg(1, "_\n");
diff --git a/poldek_ts.c b/poldek_ts.c
-index a0dd436..306b492 100644
+index a0dd436..a670379 100644
--- a/poldek_ts.c
+++ b/poldek_ts.c
@@ -834,9 +834,10 @@ void poldek__ts_update_summary(struct poldek_ts *ts,
@@ -24,14 +24,13 @@
int ninst = 0, ndep = 0, nrm = 0, npkgs = 0, parseable = 0;
+ long sinsts = 0, sdeps = 0, srems = 0, sdiff = 0;
tn_array *ipkgs, *idepkgs, *rmpkgs, *pkgs;
-- char ms[1024], *to, *prefix;
+ char ms[1024], *to, *prefix;
- int n;
-+ char ms[1024], *to, *prefix, *take;
+ int i, n;
ipkgs = n_hash_get(ts->ts_summary, "I");
idepkgs = n_hash_get(ts->ts_summary, "D");
-@@ -846,16 +847,36 @@ void poldek__ts_display_summary(struct poldek_ts *ts)
+@@ -846,16 +847,34 @@ void poldek__ts_display_summary(struct poldek_ts *ts)
ndep = idepkgs ? n_array_size(idepkgs) : 0;
nrm = rmpkgs ? n_array_size(rmpkgs) : 0;
@@ -62,19 +61,17 @@
+ prefix = "I";
+ pkgs = ipkgs;
+ npkgs = ninst + ndep;
-+ take = _("take");
+ sdiff = sinsts + sdeps - srems;
+ } else {
to = _("to remove");
prefix = "R";
pkgs = rmpkgs;
npkgs = nrm + ndep;
-+ take = _("free");
+ sdiff = sdeps + srems;
nrm = 0;
}
n_assert(pkgs);
-@@ -896,6 +917,12 @@ void poldek__ts_display_summary(struct poldek_ts *ts)
+@@ -896,6 +915,16 @@ void poldek__ts_display_summary(struct poldek_ts *ts)
if (rmpkgs)
packages_display_summary(1, "R", rmpkgs, parseable);
}
@@ -82,7 +79,11 @@
+ if (sdiff) {
+ char size[64];
+ snprintf_size(size, sizeof(size), abs(sdiff), 1, 1);
-+ msgn(1, _("This operation will %s %s of disk space."), take, size);
++
++ if (sdiff > 0 && ts->type != POLDEK_TS_UNINSTALL)
++ msgn(1, _("This operation will take %s of disk space."), size);
++ else
++ msgn(1, _("This operation will free %s of disk space."), size);
+ }
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poldek/poldek-show_only_relative_used_space.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list