summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-12-08 08:17:41 +0000
committerAaron Griffin <aaron@archlinux.org>2006-12-08 08:17:41 +0000
commit716e9ef09591318c415137a521d6391df4c0c955 (patch)
treea3de7bfa9a345ae1cb2a23f5c9d5f21b1443baf6
parentfc361cc1116b23ec4154bca5e59f562a746b80e6 (diff)
downloadpacman-716e9ef09591318c415137a521d6391df4c0c955.tar.xz
A few minor updates so --root works again.
-rw-r--r--doc/po/hu.po6
-rw-r--r--doc/po/pacman.pot6
-rw-r--r--src/pacman/conf.c1
-rw-r--r--src/pacman/conf.h2
-rw-r--r--src/pacman/pacman.c4
5 files changed, 11 insertions, 8 deletions
diff --git a/doc/po/hu.po b/doc/po/hu.po
index dec8ec25..117aecd7 100644
--- a/doc/po/hu.po
+++ b/doc/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pacman\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-14 13:52-0600\n"
+"POT-Creation-Date: 2006-12-08 13:57-0600\n"
"PO-Revision-Date: 2006-08-26 14:53+0200\n"
"Last-Translator: Hungarian <frugalware-devel@frugalware.org>\n"
"Language-Team: Hungarian <frugalware-devel@frugalware.org>\n"
@@ -513,8 +513,8 @@ msgstr ""
# type: Plain text
#: pacman.8:172
msgid ""
-"Display all groups that a specified package is part of. If no package names "
-"are provided, all groups and members will be listed."
+"Display all package members of a named group, or all grouped packages if no "
+"name is specified."
msgstr ""
# type: Plain text
diff --git a/doc/po/pacman.pot b/doc/po/pacman.pot
index 4f003b12..7db5e0bc 100644
--- a/doc/po/pacman.pot
+++ b/doc/po/pacman.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-11-14 13:52-0600\n"
+"POT-Creation-Date: 2006-12-08 13:57-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -513,8 +513,8 @@ msgstr ""
# type: Plain text
#: pacman.8:172
msgid ""
-"Display all groups that a specified package is part of. If no package names "
-"are provided, all groups and members will be listed."
+"Display all package members of a named group, or all grouped packages if no "
+"name is specified."
msgstr ""
# type: Plain text
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index ef380580..a429690e 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -53,6 +53,7 @@ int config_free(config_t *config)
return(-1);
}
+ FREE(config->root);
FREE(config->configfile);
FREELIST(config->op_s_ignore);
free(config);
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index 79f9c0ec..a4bac015 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -23,7 +23,7 @@
typedef struct __config_t {
/* command line options */
- const char *root;
+ char *root;
const char *dbpath;
const char *cachedir;
char *configfile;
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index d99ddc04..0f55ec43 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -356,10 +356,12 @@ static int parseargs(int argc, char *argv[])
config->flags |= PM_TRANS_FLAG_PRINTURIS;
break;
case 'r':
+ printf("setting root path=%s\n", optarg);
if(realpath(optarg, root) == NULL) {
perror(_("bad root path"));
return(1);
}
+ config->root = strdup(root);
break;
case 's':
config->op_s_search = 1;
@@ -488,7 +490,7 @@ int main(int argc, char *argv[])
#endif
if(config->root == NULL) {
- config->root = PM_ROOT;
+ config->root = strdup(PM_ROOT);
}
/* initialize pm library */