summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2007-08-18 08:37:15 +0000
committeruid3020 <uid3020>2007-08-18 08:37:15 +0000
commit532f7f7e30d54bf87f93ffa66dd503b8bff70e0c (patch)
tree285afc9fffff9b9ead3121deb20ce458140343dc
parentcf94986afb2eeb2ff0294e4448980f4030880a9e (diff)
handle -m too. Fix bug #12018. Patch by Matthias Clasen
2007-08-18 Vincent Untz <vuntz@gnome.org> * src/install.c: (parse_options_callback): handle -m too. Fix bug #12018. Patch by Matthias Clasen <mclasen@redhat.com>
-rw-r--r--ChangeLog6
-rw-r--r--src/install.c9
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e49b4dc..8c6c49c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-08-18 Vincent Untz <vuntz@gnome.org>
+ * src/install.c: (parse_options_callback): handle -m too.
+ Fix bug #12018.
+ Patch by Matthias Clasen <mclasen@redhat.com>
+
+2007-08-18 Vincent Untz <vuntz@gnome.org>
+
Handle X-Foo in environments.
Based on patch by Stanislav Brabec <sbrabec@suse.cz>.
Fix bug #11565.
diff --git a/src/install.c b/src/install.c
index 693940c..4920377 100644
--- a/src/install.c
+++ b/src/install.c
@@ -429,8 +429,10 @@ parse_options_callback (const gchar *option_name,
gpointer data,
GError **error)
{
- /* skip "--" */
- option_name += 2;
+ /* skip "-" or "--" */
+ option_name++;
+ if (*option_name == '-')
+ option_name++;
if (strcmp (OPTION_VENDOR, option_name) == 0)
{
@@ -480,7 +482,8 @@ parse_options_callback (const gchar *option_name,
g_strdup (value));
}
- else if (strcmp (OPTION_MODE, option_name) == 0)
+ else if (strcmp (OPTION_MODE, option_name) == 0 ||
+ strcmp ("m", option_name) == 0)
{
unsigned long ul;
char *end;