diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:59:49 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:59:49 +0000 |
| commit | 259ca5969a2efbb1a541c7a9e9391531689cd865 (patch) | |
| tree | 9991783488e2ca40438b7b813667a632d1a47a96 | |
| parent | ac7fd99caa83462c4ec962dda7897275eb64930b (diff) | |
apt-extracttemplates now prepends the package name when...
Author: doogie
Date: 2002-11-09 22:41:55 GMT
apt-extracttemplates now prepends the package name when extracting files.
| -rw-r--r-- | cmdline/apt-extracttemplates.cc | 10 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/apt-extracttemplates.1.sgml | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index d77057786..9261f6805 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-extracttemplates.cc,v 1.11 2002/09/21 21:29:13 jgg Exp $ +// $Id: apt-extracttemplates.cc,v 1.12 2002/11/09 22:41:55 doogie Exp $ /* ###################################################################### APT Extract Templates - Program to extract debconf config and template @@ -243,11 +243,11 @@ int ShowHelp(void) // WriteFile - write the contents of the passed string to a file /*{{{*/ // --------------------------------------------------------------------- /* */ -string WriteFile(const char *prefix, const char *data) +string WriteFile(const char *package, const char *prefix, const char *data) { char fn[512]; static int i; - snprintf(fn, sizeof(fn), "%s/%s.%u%d", _config->Find("APT::ExtractTemplates::TempDir", TMPDIR).c_str(), prefix, getpid(), i++); + snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d", _config->Find("APT::ExtractTemplates::TempDir", TMPDIR).c_str(), package, prefix, getpid(), i++); FileFd f; if (data == NULL) data = ""; @@ -268,8 +268,8 @@ string WriteFile(const char *prefix, const char *data) /* */ void WriteConfig(const DebFile &file) { - string templatefile = WriteFile("template", file.Template); - string configscript = WriteFile("config", file.Config); + string templatefile = WriteFile(file.package, "template", file.Template); + string configscript = WriteFile(file.package, "config", file.Config); if (templatefile.empty() == true || configscript.empty() == true) return; diff --git a/debian/changelog b/debian/changelog index 479dfa7c2..6e209615c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,8 @@ apt (0.5.5) unstable; urgency=low * Remove 'Sorry' from messages. Closes: #148824. * Change wording of 'additional disk space usage' message. Closes: #135021. + * apt-extracttemplates now prepends the package name when extracting + files. Closes: #132776 -- Jason Gunthorpe <jgg@debian.org> Sun, 15 Sep 2002 17:16:59 -0600 diff --git a/doc/apt-extracttemplates.1.sgml b/doc/apt-extracttemplates.1.sgml index 2079e5189..df2bd0b93 100644 --- a/doc/apt-extracttemplates.1.sgml +++ b/doc/apt-extracttemplates.1.sgml @@ -42,8 +42,8 @@ <para> template-file and config-script are written to the temporary directory specified by the -t or --tempdir (<literal/APT::ExtractTemplates::TempDir/>) - directory, with filenames of the form <filename>template.XXXX</> and - <filename>config.XXXX</> + directory, with filenames of the form <filename>package.template.XXXX</> and + <filename>package.config.XXXX</> </RefSect1> <RefSect1><Title>Options</> |