summaryrefslogtreecommitdiff
path: root/apt-inst
diff options
context:
space:
mode:
authorChristian Perrier <bubulle@debian.org>2005-11-30 07:58:36 +0000
committerChristian Perrier <bubulle@debian.org>2005-11-30 07:58:36 +0000
commita0f9b6bee8dae6eff15873db311f5a44cbb16fb3 (patch)
tree4e57d4dfde17e9ba521386750d1bcdd0b73e6fe9 /apt-inst
parent5d47e7e8587e693050f4d6d39c7d496f12bc49b3 (diff)
parent39442e44c7f68722014dbcd6af061c2856ce76db (diff)
Merge with Michael AND update PO files
* po/fr.po: Completed to 510 strings * po/*.po��: Synced with the POT files Patches applied: * apt@packages.debian.org/apt--sources-list-d--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-30 * apt@packages.debian.org/apt--sources-list-d--0--patch-1 Patch from apt-rpm via Michael Vogt to implement /etc/apt/sources.list.d * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-85 * merged with bubulle, changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-86 * merged the NMU from Franz Pop, fixed armeb problem (#333599) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-87 * removed double armeb entry in buildlib/sizetable * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-88 * finalized changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-89 * turn off "secure-acquire" when --allow-unauthenticated is given * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-90 * merged the sources.list.d patch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-91 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-92 * changelog update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-93 * sources.list.d documented * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-94 * pkgDirStream has (slightly) better extract support now * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-95 * merge fix for #339533 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-96 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-97 * some more debug output * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-98 * ABI change: merged more flexible pkgAcquireFile code * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-99 * merged http download limit for apt (#146877) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-100 * applied parts of the string speedup patch from debian #319377 (ABI change) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-101 * fix for #340448 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-102 * finalized this release * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-103 * changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-104 * build-depend on libdb4.3 now, fix for kFreeBSD (#317718) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-105 * fix mailaddress * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-106 * fix a string (thanks to bubulle)
Diffstat (limited to 'apt-inst')
-rw-r--r--apt-inst/dirstream.cc16
1 files changed, 16 insertions, 0 deletions
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index 7ae93c9b0..898ede31b 100644
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -61,6 +61,22 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
case Item::CharDevice:
case Item::BlockDevice:
case Item::Directory:
+ {
+ struct stat Buf;
+ // check if the dir is already there, if so return true
+ if (stat(Itm.Name,&Buf) == 0)
+ {
+ if(S_ISDIR(Buf.st_mode))
+ return true;
+ // something else is there already, return false
+ return false;
+ }
+ // nothing here, create the dir
+ if(mkdir(Itm.Name,Itm.Mode) < 0)
+ return false;
+ return true;
+ break;
+ }
case Item::FIFO:
break;
}