moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

A few minor updates so --root works again.

This commit is contained in:
Aaron Griffin 2006-12-08 08:17:41 +00:00
parent fc361cc111
commit 716e9ef095
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/po/hu.po
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: pacman\n" "Project-Id-Version: pacman\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2006-08-26 14:53+0200\n"
"Last-Translator: Hungarian <frugalware-devel@frugalware.org>\n" "Last-Translator: Hungarian <frugalware-devel@frugalware.org>\n"
"Language-Team: Hungarian <frugalware-devel@frugalware.org>\n" "Language-Team: Hungarian <frugalware-devel@frugalware.org>\n"
@ -513,8 +513,8 @@ msgstr ""
# type: Plain text # type: Plain text
#: pacman.8:172 #: pacman.8:172
msgid "" msgid ""
"Display all groups that a specified package is part of. If no package names " "Display all package members of a named group, or all grouped packages if no "
"are provided, all groups and members will be listed." "name is specified."
msgstr "" msgstr ""
# type: Plain text # type: Plain text

6
doc/po/pacman.pot
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -513,8 +513,8 @@ msgstr ""
# type: Plain text # type: Plain text
#: pacman.8:172 #: pacman.8:172
msgid "" msgid ""
"Display all groups that a specified package is part of. If no package names " "Display all package members of a named group, or all grouped packages if no "
"are provided, all groups and members will be listed." "name is specified."
msgstr "" msgstr ""
# type: Plain text # type: Plain text

1
src/pacman/conf.c
View File

@ -53,6 +53,7 @@ int config_free(config_t *config)
return(-1); return(-1);
} }
FREE(config->root);
FREE(config->configfile); FREE(config->configfile);
FREELIST(config->op_s_ignore); FREELIST(config->op_s_ignore);
free(config); free(config);

2
src/pacman/conf.h
View File

@ -23,7 +23,7 @@
typedef struct __config_t { typedef struct __config_t {
/* command line options */ /* command line options */
const char *root; char *root;
const char *dbpath; const char *dbpath;
const char *cachedir; const char *cachedir;
char *configfile; char *configfile;

4
src/pacman/pacman.c
View File

@ -356,10 +356,12 @@ static int parseargs(int argc, char *argv[])
config->flags |= PM_TRANS_FLAG_PRINTURIS; config->flags |= PM_TRANS_FLAG_PRINTURIS;
break; break;
case 'r': case 'r':
printf("setting root path=%s\n", optarg);
if(realpath(optarg, root) == NULL) { if(realpath(optarg, root) == NULL) {
perror(_("bad root path")); perror(_("bad root path"));
return(1); return(1);
} }
config->root = strdup(root);
break; break;
case 's': case 's':
config->op_s_search = 1; config->op_s_search = 1;
@ -488,7 +490,7 @@ int main(int argc, char *argv[])
#endif #endif
if(config->root == NULL) { if(config->root == NULL) {
config->root = PM_ROOT; config->root = strdup(PM_ROOT);
} }
/* initialize pm library */ /* initialize pm library */