diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2006-02-11 15:16:17 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2006-02-11 15:16:17 +0000 |
commit | 68306aa9907c1841aa086aa38c5b00d7a633b288 (patch) | |
tree | 9b6606e4d91f3130da4e037cfeb345b7fa2a27e8 | |
parent | a61ce69e1d47ac13e39498d5d0ba319319f0f679 (diff) | |
download | quilt-68306aa9907c1841aa086aa38c5b00d7a633b288.tar.gz |
- Some versions of mkdir screw up on `mkdir -p dir/.' when dir
does not already exist.
-rw-r--r-- | po/de.po | 4 | ||||
-rw-r--r-- | po/fr.po | 4 | ||||
-rw-r--r-- | po/ja.po | 4 | ||||
-rw-r--r-- | po/quilt.pot | 4 | ||||
-rw-r--r-- | quilt.changes | 6 | ||||
-rw-r--r-- | quilt/setup.in | 2 |
6 files changed, 15 insertions, 9 deletions
@@ -1426,11 +1426,11 @@ msgstr "" msgid "The -v option will show rpm's output\\n" msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n" -#: quilt/setup.in:198 +#: quilt/setup.in:197 msgid "File %s not found in search path\\n" msgstr "Datei %s nicht im Suchpfad gefunden\\n" -#: quilt/setup.in:201 +#: quilt/setup.in:200 msgid "Unpacking archive %s\\n" msgstr "Entpacke Archiv %s\\n" @@ -1429,12 +1429,12 @@ msgstr "" msgid "The -v option will show rpm's output\\n" msgstr "L'option -v montre les affichages de rpm\\\\n" -#: quilt/setup.in:198 +#: quilt/setup.in:197 #, fuzzy msgid "File %s not found in search path\\n" msgstr "Le fichier %s n'est pas dans le patch %s.\\n" -#: quilt/setup.in:201 +#: quilt/setup.in:200 msgid "Unpacking archive %s\\n" msgstr "Désarchivage de %s\\n" @@ -1386,12 +1386,12 @@ msgstr "" msgid "The -v option will show rpm's output\\n" msgstr "-vオプションを使ã£ã¦ã€rpmã®å‡ºåŠ›ã‚’表示ã§ãã¾ã™" -#: quilt/setup.in:198 +#: quilt/setup.in:197 #, fuzzy msgid "File %s not found in search path\\n" msgstr "ファイル %s ã¯ã€ãƒ‘ッム%s ã«å«ã¾ã‚Œã¦ã„ã¾ã›ã‚“\\n" -#: quilt/setup.in:201 +#: quilt/setup.in:200 msgid "Unpacking archive %s\\n" msgstr "アーカイブ %s を展開ã—ã¦ã„ã¾ã™\\n" diff --git a/po/quilt.pot b/po/quilt.pot index f8b8d3d..c21e909 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -999,11 +999,11 @@ msgstr "" msgid "The -v option will show rpm's output\\n" msgstr "" -#: quilt/setup.in:198 +#: quilt/setup.in:197 msgid "File %s not found in search path\\n" msgstr "" -#: quilt/setup.in:201 +#: quilt/setup.in:200 msgid "Unpacking archive %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index dbc9e8a..185ca53 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Feb 11 16:16:25 CET 2006 - agruen@suse.de + +- Some versions of mkdir screw up on `mkdir -p dir/.' when dir + does not already exist. + +------------------------------------------------------------------- Sat Feb 11 15:35:51 CET 2006 - agruen@suse.de - bin/patch-wrapper.in: Call GNU patch by absolute patch to avoid diff --git a/quilt/setup.in b/quilt/setup.in index 3f2ac2e..911c757 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -190,7 +190,6 @@ check_for_existing_files || exit 1 while read tag dir arg1 arg2 do - mkdir -p "$prefix$dir" case "$tag" in tar) if ! tarball=$(find_tarball "$arg1") @@ -199,6 +198,7 @@ do exit 1 fi printf $"Unpacking archive %s\n" "$tarball" + mkdir -p "${prefix:-.}" "$prefix$dir" cat_file "$tarball" \ | tar xf - -C "$prefix$dir" ;; |