Merge lp:~bjornt/landscape-client/remove-smart-update into lp:~landscape/landscape-client/trunk

[Björn Tillenius]

Remove the smart-update command and remove all mentions of it in the
client code. I changed all places that mention smart-update to talk
about apt-update instead.

[lp:~bjornt/landscape-client/remove-smart-update]

573. By Björn Tillenius on 2012-05-10

Remove some smart references in comments.

[Mike Milner (milner)]

Yea! One less suid root binary!

Looks great, +1

review: Approve

[Alberto Donato (ack)]

Looks good, +1!

Just one nitpick:

+ @cvar apt_update_interval: Don't update the Apt index more often

+ The package (apt) cache should be reset between task runs.

"APT" should be uppercase

review: Approve

[lp:~bjornt/landscape-client/remove-smart-update]

574. By Björn Tillenius on 2012-05-16

Typos.

=== modified file 'landscape/constants.py'
--- landscape/constants.py	2012-04-04 14:03:04 +0000
+++ landscape/constants.py	2012-05-16 08:39:17 +0000
@@ -26,8 +26,8 @@
 # package reporter.
 # 2.  We lost some package data, for example by a deb archive becoming
 # inaccessible for a while.  The earliest we can reasonably assume that to be
-# resolved is in 60 minutes, when the smart cronjob runs again.
+# resolved is in 60 minutes, when the package reporter runs again.
 
 # So we'll give the problem one chance to resolve itself, by only waiting for
-# one run of smart update.
+# one run of apt-update.
 UNKNOWN_PACKAGE_DATA_TIMEOUT = 70 * 60

=== modified file 'landscape/manager/aptsources.py'
--- landscape/manager/aptsources.py	2011-07-07 09:19:59 +0000
+++ landscape/manager/aptsources.py	2012-05-16 08:39:17 +0000
@@ -156,8 +156,8 @@
         """Once the repositories are modified, trigger a reporter run."""
         reporter = find_reporter_command()
 
-        # Force a smart-update run, because the sources.list has changed
-        args = ["--force-smart-update"]
+        # Force an apt-update run, because the sources.list has changed
+        args = ["--force-apt-update"]
 
         if self.registry.config.config is not None:
             args.append("--config=%s" % self.registry.config.config)

=== modified file 'landscape/manager/tests/test_aptsources.py'
--- landscape/manager/tests/test_aptsources.py	2011-12-09 14:18:29 +0000
+++ landscape/manager/tests/test_aptsources.py	2012-05-16 08:39:17 +0000
@@ -388,7 +388,7 @@
 
         def _run_process(command, args, env={}, path=None, uid=None, gid=None):
             self.assertEqual(find_reporter_command(), command)
-            self.assertEqual(["--force-smart-update", "--config=%s" %
+            self.assertEqual(["--force-apt-update", "--config=%s" %
                               self.manager.config.config], args)
             deferred.callback(("ok", "", 0))
             return deferred

=== modified file 'landscape/package/releaseupgrader.py'
--- landscape/package/releaseupgrader.py	2012-03-05 14:11:42 +0000
+++ landscape/package/releaseupgrader.py	2012-05-16 08:39:17 +0000
@@ -301,8 +301,8 @@
 
         reporter = find_reporter_command()
 
-        # Force a smart-update run, because the sources.list has changed
-        args = ["--force-smart-update"]
+        # Force an apt-update run, because the sources.list has changed
+        args = ["--force-apt-update"]
 
         if self._config.config is not None:
             args.append("--config=%s" % self._config.config)

=== modified file 'landscape/package/reporter.py'
--- landscape/package/reporter.py	2012-05-09 23:55:33 +0000
+++ landscape/package/reporter.py	2012-05-16 08:39:17 +0000
@@ -30,9 +30,9 @@
         reporter-specific options.
         """
         parser = super(PackageReporterConfiguration, self).make_parser()
-        parser.add_option("--force-smart-update", default=False,
+        parser.add_option("--force-apt-update", default=False,
                           action="store_true",
-                          help="Force running smart-update.")
+                          help="Force running apt-update.")
         return parser
 
 
@@ -40,15 +40,14 @@
     """Report information about the system packages.
 
     @cvar queue_name: Name of the task queue to pick tasks from.
-    @cvar smart_update_interval: Time interval in minutes to pass to
-        the C{--after} command line option of C{smart-update}.
+    @cvar apt_update_interval: Don't update the APT index more often
+        than the given interval in minutes.
     """
     config_factory = PackageReporterConfiguration
 
     queue_name = "reporter"
 
-    smart_update_interval = 60
-    smart_update_filename = "/usr/lib/landscape/smart-update"
+    apt_update_interval = 60
     apt_update_filename = "/usr/lib/landscape/apt-update"
     sources_list_filename = "/etc/apt/sources.list"
     sources_list_directory = "/etc/apt/sources.list.d"
@@ -192,8 +191,8 @@
 
         @return: a deferred returning (out, err, code)
         """
-        if (self._config.force_smart_update or self._apt_sources_have_changed()
-            or self._apt_update_timeout_expired(self.smart_update_interval)):
+        if (self._config.force_apt_update or self._apt_sources_have_changed()
+            or self._apt_update_timeout_expired(self.apt_update_interval)):
 
             result = spawn_process(self.apt_update_filename)
 
@@ -359,7 +358,7 @@
     def request_unknown_hashes(self):
         """Detect available packages for which we have no hash=>id mappings.
 
-        This method will verify if there are packages that Apt knows
+        This method will verify if there are packages that APT knows
         about but for which we don't have an id yet (no hash => id
         translation), and deliver a message (unknown-package-hashes)
         to request them.

=== modified file 'landscape/package/tests/test_changer.py'
--- landscape/package/tests/test_changer.py	2012-05-08 23:59:09 +0000
+++ landscape/package/tests/test_changer.py	2012-05-16 08:39:17 +0000
@@ -435,7 +435,7 @@
 
     def test_tasks_are_isolated_cache(self):
         """
-        The package (apt/smart) cache should be reset between task runs.
+        The package (APT) cache should be reset between task runs.
         In this test, we try to run two different operations, first
         installing package 2, then removing package 1.  Both tasks will
         fail for lack of superuser privileges.  If the package cache
@@ -527,7 +527,7 @@
         """
         Besides asking for individual changes, the server may also request
         the client to perform a global upgrade.  This would be the equivalent
-        of a "smart upgrade" command being executed in the command line.
+        of a "apt-get upgrade" command being executed in the command line.
         """
         hash1, hash2 = self.set_pkg2_upgrades_pkg1()
         self.store.set_hash_ids({hash1: 1, hash2: 2})
@@ -640,7 +640,6 @@
         getuid_mock()
         self.mocker.result(0)
 
-        # The order matters (first smart then gid and finally uid)
         self.mocker.order()
 
         # We want to return a known gid

=== modified file 'landscape/package/tests/test_releaseupgrader.py'
--- landscape/package/tests/test_releaseupgrader.py	2012-03-05 14:11:42 +0000
+++ landscape/package/tests/test_releaseupgrader.py	2012-05-16 08:39:17 +0000
@@ -655,7 +655,7 @@
 
             def check_result((out, err, code)):
                 self.assertFalse(os.path.exists(upgrade_tool_directory))
-                self.assertEqual(out, "--force-smart-update\n%s\n"
+                self.assertEqual(out, "--force-apt-update\n%s\n"
                                   % os.getcwd())
                 self.assertEqual(err, "")
                 self.assertEqual(code, 0)
@@ -738,7 +738,7 @@
             result = self.upgrader.finish()
 
             def check_result((out, err, code)):
-                self.assertEqual(out, "--force-smart-update "
+                self.assertEqual(out, "--force-apt-update "
                                        "--config=/some/config\n")
                 self.assertEqual(err, "")
                 self.assertEqual(code, 0)

=== modified file 'landscape/package/tests/test_reporter.py'
--- landscape/package/tests/test_reporter.py	2012-05-09 23:50:30 +0000
+++ landscape/package/tests/test_reporter.py	2012-05-16 08:39:17 +0000
@@ -29,15 +29,15 @@
 
 class PackageReporterConfigurationTest(unittest.TestCase):
 
-    def test_force_smart_update_option(self):
+    def test_force_apt_update_option(self):
         """
-        The L{PackageReporterConfiguration} supports a '--force-smart-update'
+        The L{PackageReporterConfiguration} supports a '--force-apt-update'
         command line option.
         """
         config = PackageReporterConfiguration()
-        self.assertFalse(config.force_smart_update)
-        config.load(["--force-smart-update"])
-        self.assertTrue(config.force_smart_update)
+        self.assertFalse(config.force_apt_update)
+        config.load(["--force-apt-update"])
+        self.assertTrue(config.force_apt_update)
 
 
 class PackageReporterTestMixin(object):
@@ -1136,13 +1136,13 @@
         reactor.callWhenRunning(do_test)
         return deferred
 
-    def test_run_apt_update_with_force_smart_update(self):
+    def test_run_apt_update_with_force_apt_update(self):
         """
         L{PackageReporter.run_apt_update} forces an apt-update run if the
-        '--force-smart-update' command line option was passed.
+        '--force-apt-update' command line option was passed.
         """
         self.makeFile("", path=self.config.update_stamp_filename)
-        self.config.load(["--force-smart-update"])
+        self.config.load(["--force-apt-update"])
         self._make_fake_apt_update()
 
         deferred = Deferred()
@@ -1158,7 +1158,7 @@
         reactor.callWhenRunning(do_test)
         return deferred
 
-    def test_run_apt_update_with_force_smart_update_if_sources_changed(self):
+    def test_run_apt_update_with_force_apt_update_if_sources_changed(self):
         """
         L{PackageReporter.run_apt_update} forces an apt-update run if the APT
         sources.list file has changed.

=== modified file 'landscape/package/tests/test_taskhandler.py'
--- landscape/package/tests/test_taskhandler.py	2012-05-08 23:25:08 +0000
+++ landscape/package/tests/test_taskhandler.py	2012-05-16 08:39:17 +0000
@@ -29,7 +29,7 @@
     def test_update_stamp_option(self):
         """
         L{PackageReporterConfiguration.update_stamp_filename} points
-        to the smart-update stamp file.
+        to the update-stamp file.
         """
         config = PackageTaskHandlerConfiguration()
         self.assertEqual(

=== modified file 'landscape/watchdog.py'
--- landscape/watchdog.py	2012-03-06 09:17:51 +0000
+++ landscape/watchdog.py	2012-05-16 08:39:17 +0000
@@ -631,7 +631,7 @@
     In particular unset all variables beginning with DEBIAN_ or DEBCONF_,
     to avoid any problems when landscape-client is invoked from its
     postinst script.  Some environment variables may be set which would affect
-    *other* maintainer scripts which landscape-client invokes (via smart).
+    *other* maintainer scripts which landscape-client invokes.
     """
     for key in os.environ.keys():
         if (key.startswith("DEBIAN_")

=== removed directory 'smart-update'
=== removed file 'smart-update/Makefile'
--- smart-update/Makefile	2009-06-08 10:51:59 +0000
+++ smart-update/Makefile	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-
-smart-update: smart-update.c
-	$(CC) $(CFLAGS) -Wall $< -o $@
-
-clean:
-	rm -f smart-update

=== removed file 'smart-update/smart-update.c'
--- smart-update/smart-update.c	2010-04-14 14:08:30 +0000
+++ smart-update/smart-update.c	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-/*
-
- Copyright (c) 2004 Conectiva, Inc.
- Copyright (c) 2009 Canonical, Ltd.
-
- Written by Gustavo Niemeyer <[e-mail]>,
-            Free Ekanayaka <[e-mail]>
-
- This file is part of Smart Package Manager.
-
- Smart Package Manager is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2 of the License, or (at
- your option) any later version.
-
- Smart Package Manager is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Smart Package Manager; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-#define _GNU_SOURCE
-#include <sys/resource.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <grp.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
-#include <pwd.h>
-
-#define GNUPG_HOME "/root/.gnupg"
-
-int main(int argc, char *argv[], char *envp[])
-{
-    char *smart_argv[] = {"/usr/share/smart/smart", "update", NULL, NULL};
-    char *smart_envp[] = {"PATH=/bin:/usr/bin", NULL, NULL};
-
-    // Set the HOME environment variable
-    struct passwd *pwd = getpwuid(geteuid());
-    if (!pwd) {
-        fprintf(stderr, "error: Unable to find passwd entry for uid %d (%s)\n",
-                geteuid(), strerror(errno));
-        exit(1);
-    }
-    if (asprintf(&smart_envp[1], "HOME=%s", pwd->pw_dir) == -1) {
-        perror("error: Unable to create HOME environment variable");
-        exit(1);
-    }
-
-    // Handle the --after command line option
-    if (argc != 1) {
-        if (argc != 3 || strcmp(argv[1], "--after") != 0) {
-          fprintf(stderr, "error: Unsupported command line option\n");
-          exit(1);
-        }
-        char *end;
-        long interval = strtol(argv[2], &end, 10);
-        if (end == argv[2]) {
-          fprintf(stderr, "error: Interval value '%s' not a number\n", argv[2]);
-          exit(1);
-        }
-        if (asprintf(&smart_argv[2], "--after=%ld", interval) == -1) {
-          perror("error: Unable to create argument variable");
-          exit(1);
-        }
-    }
-
-    // Drop any supplementary group
-    if (setgroups(0, NULL) == -1) {
-        perror("error: Unable to set supplementary groups IDs");
-        exit(1);
-    }
-
-    // Set real/effective gid and uid
-    if (setregid(pwd->pw_gid, pwd->pw_gid) == -1) {
-        fprintf(stderr, "error: Unable to set real and effective gid (%s)\n",
-                strerror(errno));
-        exit(1);
-    }
-    if (setreuid(pwd->pw_uid, pwd->pw_uid) == -1) {
-        perror("error: Unable to set real and effective uid");
-        exit(1);
-    }
-
-    // Close all file descriptors except the standard ones
-    struct rlimit rlp;
-    if (getrlimit(RLIMIT_NOFILE, &rlp) == -1) {
-        perror("error: Unable to determine file descriptor limits");
-        exit(1);
-    }
-    int file_max;
-    if (rlp.rlim_max == RLIM_INFINITY || rlp.rlim_max > 4096)
-        file_max = 4096;
-    else
-        file_max = rlp.rlim_max;
-    int file;
-    for (file = 3; file < file_max; file++) {
-        close(file);
-    }
-
-    // Set umask to 022
-    umask(S_IWGRP | S_IWOTH);
-
-    if (chdir("/") == -1) {
-        perror("error: Unable to change working directory");
-        exit(1);
-    }
-
-    // XXX This is a workaround for Bug #562496, that makes the gpg command
-    // invoked by smart fail if the data directory doesn't exist yet
-    struct stat st;
-    if (stat(GNUPG_HOME, &st) != 0)
-      mkdir(GNUPG_HOME, S_IRWXU);
-
-    // Run smart update
-    execve(smart_argv[0], smart_argv, smart_envp);
-    perror("error: Unable to execute smart");
-    return 1;
-}
-
-/* vim:ts=4:sw=4:et
-*/