Bumping the version. Removing client code from server DEB.

Also fixing a minor bug in OnlineNotification flow arguments to support
usernames with '@' character in them.

Author: mbushkov

debian/rules

@@ -67,8 +67,6 @@ override_dh_virtualenv:
 		--extra-pip-arg "--no-index" \
 		--extra-pip-arg "--find-links=${LOCAL_DEB_PYINDEX}" \
 		--extra-pip-arg "${LOCAL_DEB_PYINDEX}/${API_SDIST}" \
-		--extra-pip-arg "${LOCAL_DEB_PYINDEX}/${TEST_SDIST}" \
-		--extra-pip-arg "${LOCAL_DEB_PYINDEX}/${CLIENT_SDIST}" \
 		--extra-pip-arg "${LOCAL_DEB_PYINDEX}/${TEMPLATES_SDIST}" \
 		--extra-pip-arg "${LOCAL_DEB_PYINDEX}/${SERVER_SDIST}" \
 		--no-test

grr/config/grr-response-server/setup.py

@@ -62,7 +62,6 @@ def make_release_tree(self, base_dir, files):
     cmdclass={"sdist": Sdist},
     entry_points={
         "console_scripts": [
-            "grr_api_shell = grr.gui.api_client.api_shell:main",
             "grr_console = grr.server.distro_entry:Console",
             "grr_config_updater = grr.server.distro_entry:ConfigUpdater",
             "grr_frontend = grr.server.distro_entry:GrrFrontend",

grr/server/flows/general/administrative.py

@@ -430,8 +430,15 @@ class OnlineNotification(flow.GRRFlow):
 
   @classmethod
   def GetDefaultArgs(cls, username=None):
-    return cls.args_type(
-        email="%s@%s" % (username, config.CONFIG.Get("Logging.domain")))
+    args = cls.args_type()
+    try:
+      args.email = "%s@%s" % (username, config.CONFIG.Get("Logging.domain"))
+    except ValueError:
+      # Just set no default if the email is not well-formed. Example: when
+      # username contains '@' character.
+      pass
+
+    return args
 
   @flow.StateHandler()
   def Start(self):

scripts/install_server_from_src.sh

@@ -74,6 +74,7 @@ done
 mkdir -p "$INSTALL_PREFIX/usr/bin/"
 
 LAUNCHER="$SRC_DIR/scripts/debian_launcher"
+$INSTALL_CMD $LAUNCHER "$INSTALL_PREFIX/usr/bin/grr_api_shell"
 $INSTALL_CMD $LAUNCHER "$INSTALL_PREFIX/usr/bin/grr_config_updater"
 $INSTALL_CMD $LAUNCHER "$INSTALL_PREFIX/usr/bin/grr_console"
 $INSTALL_CMD $LAUNCHER "$INSTALL_PREFIX/usr/bin/grr_server"

version.ini

@@ -3,7 +3,7 @@
 major = 3
 minor = 2
 revision = 1
-release = 0
+release = 1
 
 packageversion = %(major)s.%(minor)s.%(revision)spost%(release)s
 packagedepends = %(major)s.%(minor)s.*