1
1

Merge branch '1920_deba_debd_vfs_fix'

* 1920_deba_debd_vfs_fix:
  Ticket : Issues with deba and debd VFS
Этот коммит содержится в:
Yury V. Zaytsev 2010-01-02 17:04:50 +01:00
родитель ae2b21f547 fc9c24c6f9
Коммит 50825505ca
2 изменённых файлов: 4 добавлений и 4 удалений

@ -16,7 +16,7 @@ sub list
{ {
my($qarchive)=@_; my($qarchive)=@_;
$qarchive = quote($qarchive); $qarchive = quote($qarchive);
chop($date=`LC_ALL=C date "+%b %d %Y %H:%M"`); chop($date=`LC_ALL=C date "+%m-%d-%Y %H:%M"`);
chop($info_size=`apt-cache show $qarchive | wc -c`); chop($info_size=`apt-cache show $qarchive | wc -c`);
$install_size=length($pressinstall); $install_size=length($pressinstall);
$upgrade_size=length($pressupgrade); $upgrade_size=length($pressupgrade);

@ -109,7 +109,7 @@ sub list
{ {
my($archive)=@_; my($archive)=@_;
my $qarchive = quote($archive); my $qarchive = quote($archive);
chop($date=`LC_ALL=C date "+%b %d %Y %H:%M"`); chop($date=`LC_ALL=C date "+%m-%d-%Y %H:%M"`);
chop($info_size=`dpkg -s $qarchive | wc -c`); chop($info_size=`dpkg -s $qarchive | wc -c`);
$repack_size=length($pressrepack); $repack_size=length($pressrepack);
$reinstall_size=length($pressreinstall); $reinstall_size=length($pressreinstall);
@ -183,7 +183,7 @@ sub copyout
system("chmod a+x $qdestfile"); system("chmod a+x $qdestfile");
} }
} elsif($filename =~ /^DEBIAN/) { } elsif($filename =~ /^DEBIAN/) {
$filename=~s!^DEBIAN/!!; $qfilename=~s!^DEBIAN/!!;
system("cat /var/lib/dpkg/info/$qarchive.$qfilename > $qdestfile"); system("cat /var/lib/dpkg/info/$qarchive.$qfilename > $qdestfile");
} elsif($filename eq "DPKG-REMOVE" || $filename eq "APT-REMOVE") { } elsif($filename eq "DPKG-REMOVE" || $filename eq "APT-REMOVE") {
if ( open(FILEOUT,">$destfile") ) { if ( open(FILEOUT,">$destfile") ) {
@ -251,7 +251,7 @@ sub run
} elsif($filename eq "DPKG-RECONFIGURE") { } elsif($filename eq "DPKG-RECONFIGURE") {
system("dpkg-reconfigure $qarchive"); system("dpkg-reconfigure $qarchive");
} elsif($filename=~/^DEBIAN/) { } elsif($filename=~/^DEBIAN/) {
$filename=~s!^DEBIAN!!; $qfilename=~s!^DEBIAN!!;
system("/var/lib/dpkg/info/$qarchive.$qfilename"); system("/var/lib/dpkg/info/$qarchive.$qfilename");
} else { } else {
$qfilename=~s!^CONTENTS!!; $qfilename=~s!^CONTENTS!!;