Warn that we do not sync with ZMD (#217028).

diff --git a/Makefile.am b/Makefile.am
index 8f13535..204b3d6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,7 @@ package-local:        dist-bzip2 @PACKAGE@.spec
                echo "Error: $(distdir).tar.bz2 is empty" ; \
                exit 1 ; \
        fi
+       mkdir -p package
        rm -f package/*.tar.bz2
        rm -f package/*~
        rm -f package/*.bak

diff --git a/package/zypper.changes b/package/zypper.changes
index 8cba513..fd3a5f0 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Sun Nov  5 23:57:45 CET 2006 - mvidner@suse.cz
+
+- Warn that we do not sync with ZMD (#217028).
+
+-------------------------------------------------------------------
 Sun Nov  5 22:37:08 CET 2006 - mvidner@suse.cz
 
 - Implemented single package mode for update and list-updates,

diff --git a/po/cs.po b/po/cs.po
index 13b26c7..6408854 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zypper 0.5.0\n"
 "Report-Msgid-Bugs-To: translation@suse.de\n"
-"POT-Creation-Date: 2006-11-05 14:19+0100\n"
+"POT-Creation-Date: 2006-11-05 23:06+0100\n"
 "PO-Revision-Date: 2006-10-25 09:22+0200\n"
 "Last-Translator: Martin Vidner <mvidner@suse.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/zypper.cc:74
+#: src/zypper.cc:77
 msgid ""
 "  Commands:\n"
 "\thelp\t\t\tHelp\n"
@@ -37,7 +37,7 @@ msgid ""
 "\tpatch-info\t\tShow full info for patches\n"
 msgstr ""
 
-#: src/zypper.cc:251
+#: src/zypper.cc:256
 msgid ""
 "zypper refresh\n"
 "\n"

diff --git a/src/zmart-sources.cc b/src/zmart-sources.cc
index 2fd4aa4..bfa6b61 100644 (file)
--- a/src/zmart-sources.cc
+++ b/src/zmart-sources.cc
@@ -518,6 +518,15 @@ MediaWrapper::~MediaWrapper () {
     _mm.close (_id);
 }
 
+// #217028
+void warn_if_zmd () {
+  if (system ("pgrep -lx zmd") == 0) { // list name, exact match
+    cerr << "ZENworks Management Daemon is running." << endl
+        << "WARNING: this command will not synchronize changes." << endl
+        << "Use rug or yast2 for that." << endl;
+  }
+}
+
 // Local Variables:
 // c-basic-offset: 2
 // End:

diff --git a/src/zmart-sources.h b/src/zmart-sources.h
index c5a34f5..71744f0 100644 (file)
--- a/src/zmart-sources.h
+++ b/src/zmart-sources.h
@@ -22,7 +22,7 @@ void remove_source( const std::string& anystring );
 void rename_source( const std::string& anystring, const std::string& newalias );
 void list_system_sources();
 void refresh_sources();
-
+void warn_if_zmd ();
 
 //! download a copy of a remote file or just return the argument
 // The file is deleted when this class is destroyed

diff --git a/src/zypper.cc b/src/zypper.cc
index e68eade..3c66c9f 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -457,6 +457,8 @@ int one_command(const string& command, int argc, char **argv)
     if (arguments.size() > 1)
       alias = arguments[1];
 
+    warn_if_zmd ();
+
     // load gpg keys
     cond_init_target ();
 
@@ -484,6 +486,7 @@ int one_command(const string& command, int argc, char **argv)
       return !help;
     }
 
+    warn_if_zmd ();
     try {
       // also stores it
       remove_source(arguments[0]);
@@ -510,6 +513,7 @@ int one_command(const string& command, int argc, char **argv)
     }
     
     cond_init_target ();
+    warn_if_zmd ();
     try {
       // also stores it
       rename_source (arguments[0], arguments[1]);