summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2008-01-10 11:48:31 +0200
committerPanu Matilainen <pmatilai@redhat.com>2008-01-10 11:48:31 +0200
commit6243ccd1e67f23e3ff07438c34ce18d5893b51df (patch)
treedda23b4b954ee79ed287f62d9116910c08febd87
parent9672ca6925f51d4c6dc623ad1d6eda83a20d5461 (diff)
downloadrpm-6243ccd1e67f23e3ff07438c34ce18d5893b51df.tar.gz
rpm-6243ccd1e67f23e3ff07438c34ce18d5893b51df.tar.bz2
rpm-6243ccd1e67f23e3ff07438c34ce18d5893b51df.zip
And *really* skip the leading % in --define, double duh :)
-rw-r--r--lib/poptALL.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/poptALL.c b/lib/poptALL.c
index 79145438a..8b51167c0 100644
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -127,13 +127,14 @@ static void rpmcliAllArgCallback( poptContext con,
if (*t == '-') *t = '_';
t++;
}
+ t = s;
if (*t == '%') t++;
/* XXX Predefine macro if not initialized yet. */
if (rpmcliInitialized < 0)
- (void) rpmDefineMacro(NULL, s, RMIL_CMDLINE);
+ (void) rpmDefineMacro(NULL, t, RMIL_CMDLINE);
rpmcliConfigured();
- (void) rpmDefineMacro(NULL, s, RMIL_CMDLINE);
- (void) rpmDefineMacro(rpmCLIMacroContext, s, RMIL_CMDLINE);
+ (void) rpmDefineMacro(NULL, t, RMIL_CMDLINE);
+ (void) rpmDefineMacro(rpmCLIMacroContext, t, RMIL_CMDLINE);
s = _free(s);
break;
}