no_comment

5 files changed, 41 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5da0e723..be216c65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-03  Pixel  <pixel@mandrakesoft.com>
+
+	* urpmi.addmedia (substInFile): die if no rpm were found
+
 2000-05-04  Pixel  <pixel@mandrakesoft.com>
 
 	* urpmi: unset IFS
diff --git a/urpme b/urpme
index a4a8cb99..091c806f 100644
--- a/urpme
+++ b/urpme
@@ -1,5 +1,21 @@
 #!/usr/bin/perl
 
+# Copyright (C) 1999 MandrakeSoft (pixel@linux-mandrake.com)
+#
+# This program 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, or (at your option)
+# any later version.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
 local $_ = join '', @ARGV;
 
 /-h/ || @ARGV == 0 and die "usage: rpme [-a] [--auto] <packages...>\n";
diff --git a/urpmi b/urpmi
index 0c50d6a6..676a3fbf 100755
--- a/urpmi
+++ b/urpmi
@@ -1,5 +1,21 @@
 #!/usr/bin/perl -T
 
+# Copyright (C) 1999 MandrakeSoft (pixel@linux-mandrake.com)
+#
+# This program 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, or (at your option)
+# any later version.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
 load_po();
 
 $ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin";
diff --git a/urpmi.addmedia b/urpmi.addmedia
index be89cdf1..dd2ba957 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -95,6 +95,7 @@ if (my ($prefix, $dir) = $url =~ m,^(removable_.*?|file):/(.*),) {
     if (-e $f) {
 	system("cp -f $f $HDLIST");
     } else {
+	glob("$dir/*") or die "No RPM-s found! Cowardly refusing to add $dir to urpmi DB.\n";
 	system("genhdlist_cz2 -o $HDLIST $dir");
     }
 } else {
diff --git a/urpmi.spec b/urpmi.spec
index 702a68a8..3b67c9b2 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 1.1
-Release: 6mdk
+Release: 7mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Summary: User mode rpm install
@@ -89,6 +89,9 @@ autoirpm.uninstall
 
 
 %changelog
+* Tue Jun 13 2000 Pixel <pixel@mandrakesoft.com> 1.1-7mdk
+- add require wget (needed for ftp hdlist's)
+
 * Thu May  4 2000 Pixel <pixel@mandrakesoft.com> 1.1-6mdk
 - urpmi: unset IFS