poldek: poldek/cli/install.c Fix --nohold command line option bein...
arekm
arekm at pld-linux.org
Sun Nov 18 14:16:57 CET 2007
Author: arekm Date: Sun Nov 18 13:16:57 2007 GMT
Module: poldek Tag: HEAD
---- Log message:
Fix --nohold command line option being ignored. Patch from Marcin Banasiak. bug#68.
---- Files affected:
poldek/poldek/cli:
install.c (1.45 -> 1.46)
---- Diffs:
================================================================
Index: poldek/poldek/cli/install.c
diff -u poldek/poldek/cli/install.c:1.45 poldek/poldek/cli/install.c:1.46
--- poldek/poldek/cli/install.c:1.45 Sun Jul 1 23:04:26 2007
+++ poldek/poldek/cli/install.c Sun Nov 18 14:16:52 2007
@@ -174,6 +174,9 @@
{"hold", OPT_INST_HOLD, "PACKAGE[,PACKAGE]...", 0,
N_("Prevent packages listed from being upgraded if they are already installed."),
OPT_GID },
+
+{"nohold", OPT_INST_NOHOLD, 0, 0,
+ N_("Do not hold any packages. Disables --hold settings."), OPT_GID },
{"ignore", OPT_INST_IGNORE, "PACKAGE[,PACKAGE]...", 0,
N_("Make packages listed invisible."), OPT_GID },
@@ -323,17 +326,21 @@
poldek_configure(ts->ctx, POLDEK_CONF_ROOTDIR, arg);
break;
-
case OPT_INST_HOLD:
poldek_configure(ts->ctx, POLDEK_CONF_OPT, POLDEK_OP_HOLD, 1);
poldek_configure(ts->ctx, POLDEK_CONF_HOLD, arg);
break;
-
+
+ case OPT_INST_NOHOLD:
+ ts->setop(ts, POLDEK_OP_HOLD, 0);
+ poldek_configure(ts->ctx, POLDEK_CONF_OPT, POLDEK_OP_HOLD, 0);
+ break;
+
case OPT_INST_IGNORE:
poldek_configure(ts->ctx, POLDEK_CONF_OPT, POLDEK_OP_IGNORE, 1);
poldek_configure(ts->ctx, POLDEK_CONF_IGNORE, arg);
break;
-
+
case OPT_INST_NOIGNORE:
ts->setop(ts, POLDEK_OP_IGNORE, 0);
poldek_configure(ts->ctx, POLDEK_CONF_OPT, POLDEK_OP_IGNORE, 0);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/cli/install.c?r1=1.45&r2=1.46&f=u
More information about the pld-cvs-commit
mailing list