Commit 5555ef98 authored by David Kalnischkies's avatar David Kalnischkies
Browse files

drop old /var/state to /var/lib transition artefacts 

Regardless of when this transition was, it is so long ago that everyone
who would still need this has a million other problems to deal with now
so lets just drop this code.
parent 5b2c6ddc

apt-pkg/init.cc

+1 −9
Original line number Diff line number Diff line
@@ -46,14 +46,6 @@ bool pkgInitConfig(Configuration &Cnf) 
   

   // State

   Cnf.CndSet("Dir::State","var/lib/apt/");

   

   /* Just in case something goes horribly wrong, we can fall back to the

      old /var/state paths.. */

   struct stat St;   

   if (stat("/var/lib/apt/.",&St) != 0 &&

       stat("/var/state/apt/.",&St) == 0)

      Cnf.CndSet("Dir::State","var/state/apt/");

       

   Cnf.CndSet("Dir::State::lists","lists/");

   Cnf.CndSet("Dir::State::cdroms","cdroms.list");

   Cnf.CndSet("Dir::State::mirrors","mirrors/");

debian/preinst

deleted100755 → 0
+0 −32
Original line number Diff line number Diff line 
#! /bin/sh



set -e



# dpkg does this for us while we are upgrading..

#if [ "$1" = "upgrade" -a -L /var/state/apt -a -e /var/lib/apt -a ! -L /var/state/apt ] && dpkg --compare-versions "$2" ">=" "0.4.10"; then

#  rm /var/state/apt

#fi



if [ "$1" = "upgrade" -o "$1" = "install" -a "$2" != "" ]; then

  if [ ! -e /var/lib/apt -a -e /var/state/apt ]; then

    # upgrading from /var/state/apt using apt.

    # it's probably running now so we want to ensure /var/state/apt

    # is still valid afterwards. and since we're upgrading



    if [ -x /usr/bin/perl -a -d /var/state/apt -a ! -L /var/state/apt ] &&

      perl -e 'exit 1 if ((stat("/var/lib"))[0] != (stat("/var/state/apt"))[0])'

    then

      # same fs, we can mv it

      mv /var/state/apt /var/lib/apt

      ln -s ../lib/apt /var/state/apt

      # note that this symlink (/var/state/apt) will be removed when

      # dpkg finishes unpacking the apt we're about to install; this is okay

    else

      # scary, let's just symlink it and hope

      ln -s /var/state/apt /var/lib/apt

    fi

  fi

  touch /var/lib/apt/lists/partial/.delete-me-later || true

fi



#DEBHELPER#