summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-02-12 12:31:10 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-02-12 12:31:10 +0000
commit1d8f55811f3b45dc14277452e26d531126634cfc (patch)
tree0ef719b387909cdc8b1c7f4a1af1add83fa52887
parent27cee73d9ac5eb72d36726d984d2d1bc2f2a4e08 (diff)
INTEGRATION: CWS obr07 (1.3.60); FILE MERGED
2008/01/29 12:50:35 obr 1.3.60.1: handle uncompressed Solaris packages
-rw-r--r--sysui/desktop/util/pkgdiff.pl6
1 files changed, 5 insertions, 1 deletions
diff --git a/sysui/desktop/util/pkgdiff.pl b/sysui/desktop/util/pkgdiff.pl
index db8376f005a6..dca659669112 100644
--- a/sysui/desktop/util/pkgdiff.pl
+++ b/sysui/desktop/util/pkgdiff.pl
@@ -57,7 +57,11 @@ sub unpack_solpkg
sed -e '1 d' -e 's/[0-9][0-9]* [0-9][0-9]* [0-9]\\{10\\}\$//' $package/pkgmap > filelist
grep -v "^PSTAMP=" $package/pkginfo > pkginfo
cp $package/install/* .
-bzcat $package/archive/none.bz2 | cpio -i -d
+if [ -f $package/archive/none.bz2 ]; then
+ bzcat $package/archive/none.bz2 | cpio -i -d
+else
+ cp -pr $package/reloc/* .
+fi
EOF
}