(PUP-6631): attempted to support apt-mark

Author: b4ldr

lib/puppet/provider/package/apt.rb

@@ -16,6 +16,7 @@
 
   commands :aptget => "/usr/bin/apt-get"
   commands :aptcache => "/usr/bin/apt-cache"
+  commands :aptmark => "/usr/bin/apt-mark"
   commands :preseed => "/usr/bin/debconf-set-selections"
 
   defaultfor :osfamily => :debian
@@ -30,6 +31,32 @@ def self.defaultto_allow_virtual
     false
   end
 
+  def self.instances
+    packages = super
+    manual_marks = aptmark('showmanual').split("\n")
+    packages.each do |package|
+      package.mark = :manual if manual_marks.include?(package.name)
+    end
+    packages
+  end
+  def initialize(value={})
+    super(value)
+    @property_flush = {}
+  end
+
+  def mark=(value)
+    @property_flush[:mark] = value
+  end
+
+  def flush
+    # unless we are removing the package mark it if it hasn't already been marked
+    if @property_flush
+      unless @property_flush[:mark] or [:purge, :absent].include?(resource[:ensure])
+        aptmark('manual', resource[:ensure])
+      end
+    end
+  end
+
   # A derivative of DPKG; this is how most people actually manage
   # Debian boxes, and the only thing that differs is that it can
   # install packages from remote sites.

spec/unit/provider/package/apt_spec.rb

@@ -86,6 +86,34 @@
     provider.run_preseed
   end
 
+  context "When listing all instances" do
+    let(:args) { ['-W', '--showformat', %Q{'${Status} ${Package} ${Version}\\n'}] }
+    let(:bash_version) { '4.2-5ubuntu3' }
+    let(:bash_installed_output) { "install ok installed bash #{bash_version}\n" }
+    let(:bash_installed_io) { StringIO.new(bash_installed_output) }
+    let(:execpipe_args) { args.unshift('myquery') }
+
+    before do
+      allow(described_class).to receive(:command).with(:dpkgquery).and_return('myquery')
+      allow(described_class).to receive(:command).with(:aptmark, 'showmanual').and_return('bash\n')
+    end
+
+    it 'creates and return an instance for a single apt-mark entry' do
+      expect(Puppet::Util::Execution).to receive(:execpipe).with(execpipe_args).and_yield(bash_installed_io)
+      installed = double('bash', :mark => :manual)
+      expect(described_class).to receive(:new).with(
+        :ensure => "4.2-5ubuntu3",
+        :error => "ok",
+        :desired => "install",
+        :name => "bash",
+        :status => "installed",
+        :provider => :apt,
+      ).and_return(installed)
+      allow(installed).to receive(:name)
+
+      expect(described_class.instances).to eq([installed])
+    end
+  end
   describe "when installing" do
     it "should preseed if a responsefile is provided" do
       resource[:responsefile] = "/my/file"
@@ -123,36 +151,6 @@
       provider.install
     end
 
-    it "should select latest available version if range is specified" do
-      resource[:ensure] = '>60.0'
-      expect(provider).to receive(:aptget) do |*command|
-        expect(command[-1]).to eq("#{name}=72.0.1+build1-0ubuntu0.19.04.1")
-      end
-      expect(provider).to receive(:aptcache).with(:madison, name).and_return(<<-HERE)
-   #{name} | 72.0.1+build1-0ubuntu0.19.04.1 | http://ro.archive.ubuntu.com/ubuntu disco-updates/main amd64 Packages
-   #{name} | 72.0.1+build1-0ubuntu0.19.04.1 | http://security.ubuntu.com/ubuntu disco-security/main amd64 Packages
-   #{name} | 66.0.3+build1-0ubuntu1 | http://ro.archive.ubuntu.com/ubuntu disco/main amd64 Packages
-    HERE
-      expect(provider).to receive(:properties).and_return({:mark => :none})
-
-      provider.install
-    end
-
-    it "should pass through ensure is no version can be selected" do
-      resource[:ensure] = '>74.0'
-      expect(provider).to receive(:aptget) do |*command|
-        expect(command[-1]).to eq("#{name}=>74.0")
-      end
-      expect(provider).to receive(:aptcache).with(:madison, name).and_return(<<-HERE)
-   #{name} | 72.0.1+build1-0ubuntu0.19.04.1 | http://ro.archive.ubuntu.com/ubuntu disco-updates/main amd64 Packages
-   #{name} | 72.0.1+build1-0ubuntu0.19.04.1 | http://security.ubuntu.com/ubuntu disco-security/main amd64 Packages
-   #{name} | 66.0.3+build1-0ubuntu1 | http://ro.archive.ubuntu.com/ubuntu disco/main amd64 Packages
-    HERE
-      expect(provider).to receive(:properties).and_return({:mark => :none})
-
-      provider.install
-    end
-
     it "should use --force-yes if a package version is specified" do
       resource[:ensure] = '1.0'
       expect(provider).to receive(:aptget) do |*command|